diff --git a/.htaccess b/.htaccess new file mode 100644 index 0000000..e69de29 diff --git a/admin/language/en-US/lang.php b/admin/language/en-US/lang.php index 9f07fd9..f6e3cdb 100644 --- a/admin/language/en-US/lang.php +++ b/admin/language/en-US/lang.php @@ -14,11 +14,6 @@ if(!defined('IN_DZZ')) { $lang = array ( 'page_background'=>'background', - 'share_enable_successful'=>' The shared directory is enabled successfully! ', - 'share_close_successful'=>' The shared directory is closed successfully! ', - 'group_on_successful'=>' The group function has been enabled successfully! ', - 'group_close_successful'=>' The group function is disabled successfully! ', - 'database_export_custom_invalid' => 'You need to select at least one data table to back up ', 'database_exPORT_FILe_invalid' => 'Data file could not be saved to server, please check directory properties ', 'admin_navtitle'=>' Admin ', @@ -37,41 +32,15 @@ $lang = array 'cloud_type_ftp'=>'FTP', 'cloud_type_disk'=>' Local disk', - 'export_range_user'=>' Select the export range, all users in this range will export ', - 'export_data'=>' Export data item ', - 'compellation'=>' Username ', 'UserTrueName'=>' User’s real name ', - 'phone_number'=>' mobile phone number', - 'phone_number_illegal'=>' mobile phone number is illegal', - 'weixin_phone_number'=>' wechat bound mobile phone number', - 'weixin_illegal'=>' wechat illegal', - 'user_weixin'=>' employee weixin', - 'weixin_exist'=>' wechat already exists ', - 'random_password'=>' Generate random password', - 'exceptional_space'=>' extra space', - 'disable_user'=>' Disable this user', - 'block_up' => 'stop', - 'set_system_administrator'=>' Set as system administrator', - 'add_a_item'=>' add an item', - 'supervisor_position'=>' supervisor position', - 'send_password_user_mailbox'=>' Send password to mailbox', - 'login_email_required'=>' Required for login ', - 'name_will'=>' username required ', - 'none_write_login_password'=>' No login password yet ', - 'none_write_affirm_password'=>' affirm_password has not been filled in ', 'none_write_add_theme'=>' No theme added yet ', 'illegal'=>' not legal', - 'space_not_change_password'=>' Leave blank, do not change password', 'data_set'=>' Data Settings ', 'user_name'=>' user user name', 'user_name_email'=>' Username or email', 'user_name_sensitive'=>' User name contains sensitive characters ', 'avatar' => 'avatar', 'space_usage'=>' space usage', - 'department' => 'department', - 'organization' => 'institutions', - 'organization_department'=>' Organization Department ', - 'registration_time'=>' registration time', 'data_item_list'=>' item list', 'data_edit'=>' Item Edit ', 'identifier'=>' identifier', @@ -113,40 +82,12 @@ $lang = array 'user_phone_registered'=>' User phone number has been registered', 'weixin_registered'=>' the wechat signal has been registered', 'user_registered_retry'=>' The user name has been registered, please change the user name and try again ', - 'add_user'=>' Add user', - 'add_user_success'=>' User added successfully ', - 'edit_user_success'=>' Modify user information successfully ', 'email_registered_retry'=>' The mailbox has been registered, please change the mailbox and try again ', 'contact_administrator'=>' real-name authentication has not been enabled, please contact administrator', 'contact_administrator1'=>' You do not have real-name authentication authority, please contact the administrator ', 'contact_administrator2'=>' You do not have authentication authority, please contact the administrator ', 'contact_administrator3'=>' You do not have data review authority, please contact the administrator ', - 'export_user'=>' Export user', - 'shared_directory_set'=>' shared directory setting ', - 'group_on_set'=>' Group function Settings ', - 'shared_directory_desktop_shortcut'=>' Shared directory desktop shortcut', - 'position_management'=>' position management', - 'add_position'=>' Add position', - 'position_name'=>' position name', 'organization_user_manage'=>' Organization and User Management ', - 'bulking' => 'delta', - 'coverage' => 'cover', - 'import_nbsp'=>'The import', - 'creation_agency'=>' New agency', - 'creation_bottom_section'=>' Create the bottom_section', - 'creation_equally_section'=>' New sibling department ', - 'please_select_same_type_node'=>' Please select a node of the same type ', - 'please_select_same_section_node'=>' Please select a node in the same department ', - 'no_institution_users'=>' No institutional user ', - 'add_administrator_unsuccess'=>' Failed to add administrator ', - 'no_open_Shared_directory'=>' cannot be set because the shared directory is not enabled ', - 'please_select_range_export'=>' Please select the export scope ', - 'please_select_project_export'=>' Please select export project ', - 'user_information_table'=>' Person information table', - 'bulk_import_user_template'=>' Import user templates in batches ', - 'name_email_empty'=>' Username and mailbox cannot be empty', - 'lack_required_fields_name'=>' lacks the required field "user name"', - 'lack_required_fields_name_email'=>'The required field user name or mailbox is missing', 'enterprise_binding'=>' Enterprise number binding', 'enterprise_little_helper'=>' Enterprise Helper ', 'enterprise_little_helper_set'=>' Enterprise Helper setup ', @@ -260,7 +201,6 @@ $lang = array 'type_save_success'=>' Classification saved successfully! ', 'already_update'=>' updated ', 'submit_tips' => 'Press Enter to submit your changes at any time ', - 'save_changes'=>' save changes', 'starting_migration'=>' Start migration', 'migration_completed'=>' migration completed', 'routing_name'=>' route name', @@ -352,7 +292,6 @@ $lang = array 'file' => 'file', 'dir' => 'dir', 'ip' => 'IP', - 'usergroup' => 'usergroup', 'according_usergroup' => 'According to the user group', 'usernum' => 'usernum：', 'admingroup' => 'admingroup', @@ -363,9 +302,6 @@ $lang = array 'current_contents_without_saving'=>' Current contents not saved. Are you sure you want to leave? ', 'mail'=>' Mail Settings ', - 'login_username_placeholder'=>' Login username ', - 'login_username_text'=>' required, available for system login ', - 'required_used_login_system'=>' required, available for system login ', // admin/system/database.html 'nav_db_export' => 'backup ', 'nav_db_export_success' => 'Backup succeeded ', @@ -789,17 +725,6 @@ $lang = array 'main_matches_priority_text'=>' Indicates the matching order of the same domain name. The larger the number, the higher the priority. Set this item when matching areas overlap', 'main_extensions'=>' Feature extensions', 'main_extensions_text'=>' Set the feature suffix of the URL. Using the feature suffix, you can call the corresponding application to open the URL. For example, the feature suffix of the task board can be set to task', - // admin/member/adduser.html - 'adduser_login_email_text'=>' This parameter is mandatory. It can be used for system login. When employees pay attention to the enterprise ID, the enterprise ID will be matched according to the email address. ', - 'adduser_compellation_text'=>' Required, displayed in system, easy to identify ', - 'adduser_phone_number_text'=>' Set this parameter to the mobile phone number bound to wechat. When an employee pays attention to the enterprise number, it will be matched according to the mobile phone bound to wechat. ', - 'adduser_weixin_text'=>' indicates the employee’s wechat ID. When an employee follows the enterprise ID, it will match according to the employee’s wechat ID. ', - 'adduser_exceptional_space_text'=>' Unit M, additional user storage space (total user space=default space + extra space) ', - 'adduser_disable_user_text'=>' After the user is disabled, the user cannot log in to the system. Perform this operation with caution ', - 'adduser_usergroup_text'=>' After you set the user as the system administrator, this user will have the system management rights. Please be cautious! ', - // admin/member/edituser.html - 'edituser_login_email_text'=>' This parameter is optional and can be used for system login. When employees pay attention to the enterprise number, it will be matched according to the employee’s email address. ', - 'edituser_weixin_text'=>' Select, employee’s wechat ID. When employees follow enterprise ID, it will be matched according to the employee’s wechat ID. If you have paid attention to it, this item cannot be modified. ', // admin/member/main.html 'member_main_delete'=>'Are you sure you want to delete this user? All data and files of this user will be cleared and cannot be recovered', // admin/member/profileset.html @@ -816,79 +741,6 @@ $lang = array 'verifyset_verify_synopsis_text'=>' Authentication brief, will be displayed on user authentication page, support UBB', 'verifyset_choosable_data_text'=>' Note: The item selected here will only be displayed in the corresponding authentication page, not in the user profile. This is valid even if this authentication is not enabled. ', 'verifyset_verify_group_text'=>' Set the user group that is allowed to participate in the authentication, you can hold down CTRL to select multiple, empty representatives can participate in the authentication ', - // admin/orguser/detail_org.html - 'export_excl'=>' Export all users of this department to an excL file ', - 'detail_org_no_enable'=>' If not enabled, all subordinate departments will not be able to use the shared directory; The shared directory is displayed on the enterprise disk only after this function is enabled. ', - 'detail_org_explorerapp_enable'=>' When enabled, the organization or department directory can be used in applications such as web disk. ', - 'detail_org_enable'=>' The shared directory of this department will be displayed in the enterprise disk organization only after the "detail_org_enable" function is enabled. ', - 'detail_org_creation'=>' When the detail_org_creation shortcut is created, the member desktop will have the shortcut by default. ', - 'group_org_no_enable'=>' After this function is enabled, Resource Manager will display the organization group option. ', - 'group_org_enable'=>' If not enabled, resource Manager will not display the organization group option. ', - 'detail_org_administrator'=>' Note: -
  • Authority of institution administrator: set administrators of all departments under the institution, manage all personnel in the institution, and manage all shared directories of the institution
    • -
  • Department Administrator permissions: set administrators of all sub departments under the Department, manage all personnel in the Department, and manage all shared directories of the Department
    • ', - 'Select organization to set organization information'=>' Select organization to set organization information', - 'Select department to set department information'=>' Select department to set department information', - 'Select personnel to set personnel information'=>' Select personnel to set personnel information', - 'Personnel, departments and institutions can directly drag and move to change positions. Move refers to changing the Department to which the person belongs, and Changing the superior organization or department of the department.'=>' People, departments, and organizations can be dragged and moved to change positions. The movement is to change the department of the personnel, and change the superior organization or superior department of the department. ', - 'Hold' => 'Hold', - 'Key to move personnel or departments to copy. It is used to join personnel to multiple departments at the same time.'=>'Key to move people or departments for replication. Add people to multiple departments at the same time.', - 'Key can be used for multiple selections, and release after multiple selections'=>'Key can be multi - selected, multi - selected after release', - 'Key movement is batch movement. Do not loosen'=>' Key to move for batch Loosen. Don’t loosen ', - 'Right click departments, institutions and personnel to open the right-click menu. There are corresponding more operations in the Menu.'=>' Right-click the department, organization, or personnel to display the right-click menu. There are more operations in the menu. ', - 'Delete user description'=>' Delete user description', - 'Deleting users from all institutions or departments is only removing users from their own institutions or departments. Users can no longer have all the use rights of their own institutions or departments. It is not deleting users from the system.'=>'If a user is deleted from an organization or department, the user cannot have all the permission to use the organization or department. This does not mean the user is deleted from the system.', - 'When the system administrator deletes the user from the "list of non institutional users", the user will be completely deleted in the system, and all system data and saved files of the user will be deleted. Please use it cautiously by the administrator, and delete it after confirming that the member is to be deleted.'=>'If the system administrator deletes a user from the User List, the user will be completely deleted from the system, and all system data and saved files of the user will be deleted. Use caution before deleting a member.', - 'Key to move to batch copy.'=>' Key to move to batch copy. ', - 'Organization management instructions'=>' Organization Management instructions', - 'inport_guide_download'=>' Download the person information import template ', - 'inport_guide_template'=>' template items will be automatically generated based on the number of user profile items ', - 'inport_guide_user.'=>' Edit the required personnel information table according to the template. ', - 'inport_guide_step'=>' Step 3: Select Excel ', - 'inport_guide_layout'=>' Select the edited staff layout, support. XLS,. XLSX format ', - 'inport_guide_notice'=>' Edit staff information sheet notes ', - '
  • 1. Edit the personnel information to be imported according to the template fields. If there is already a file information table, you only need to change the name of the relevant field in the existing file information table to be consistent with the name provided in the template. As long as the name corresponds, the position of the field does not affect the result
    • -
  • 2. The "user name" field in the template is required, and other fields can be filled in as required
    • -
  • 3. The information in the mailbox and user name fields in the table must be unique and cannot be duplicate. If the mailbox is empty, the system will randomly generate the mailbox address when importing
    • -
  • 4. Multi level department creation: Method 1: add multiple columns of "subordinate departments" to the table. From left to right, they are level-1 departments, level-2 departments and level-3 departments. The system will create departments, subordinate departments and lower subordinate departments according to the principle from left to right. Method 2: use a single column in the table, and the superior and subordinate departments use "/" to divide (for example, primary school / grade 1 / class 1)
    • -
  • 5. Importing users can only import by organization. Multiple organizations need to be imported in batches
    • -
  • 6. The "login password" field in the table can be blank, and administrators can set unified passwords for users in batches when importing. The user can modify the unified password after logging in
    • -
  • 7. There are two import methods in the import interface: incremental and overwrite. Incremental method: when encountering the same user, only the missing field information of the user will be added, and the original information will not change. (for example, there is a user a in the system with a password of 123. In the batch import table, there is also a user a, whose unified password is set to ABC when importing. After importing, the passwords of other users are all ABC, and the original user a still keeps his original password, 123.) Overwrite import: completely replace the original user information in the system with the information in the table
    • -
  • 8. If there are many people to import, it is recommended to make a test table for a small number of people first, and then import all users in an incremental way after the test is correct
    • '=>'
  • 1. Edit the personnel information to be imported according to the template fields. If there is already a file information table, you only need to change the name of the relevant field in the existing file information table to be consistent with the name provided in the template. As long as the name corresponds, the position of the field does not affect the result
    • -
  • 2. The "user name" field in the template is required, and other fields can be filled in as required
    • -
  • 3. The information in the mailbox and user name fields in the table must be unique and cannot be duplicate. If the mailbox is empty, the system will randomly generate the mailbox address when importing
    • -
  • 4. Multi level department creation: Method 1: add multiple columns of "subordinate departments" to the table. From left to right, they are level-1 departments, level-2 departments and level-3 departments. The system will create departments, subordinate departments and lower subordinate departments according to the principle from left to right. Method 2: use a single column in the table, and the superior and subordinate departments use "/" to divide (for example, primary school / grade 1 / class 1)
    • -
  • 5. Importing users can only import by organization. Multiple organizations need to be imported in batches
    • -
  • 6. The "login password" field in the table can be blank, and administrators can set unified passwords for users in batches when importing. The user can modify the unified password after logging in
    • -
  • 7. There are two import methods in the import interface: incremental and overwrite. Incremental method: when encountering the same user, only the missing field information of the user will be added, and the original information will not change. (for example, there is a user a in the system with a password of 123. In the batch import table, there is also a user a, whose unified password is set to ABC when importing. After importing, the passwords of other users are all ABC, and the original user a still keeps his original password, 123.) Overwrite import: completely replace the original user information in the system with the information in the table
    • -
  • 8. If there are many people to import, it is recommended to make a test table for a small number of people first, and then import all users in an incremental way after the test is correct
    • ', - 'import_list_organization'=>' select the organization to import. If no organization is imported, a new organization and department will be generated according to the Department in the user information table. If no organization is imported, it will be directly imported to "personnel without organization ', - 'import_list_password'=>' default user password. When the login password item is not set, the password set here will be used as the password of the newly imported user ', - 'import_list_coverage'=>' incremental import method: the newly imported user information is intelligently added to the original user information; Overwrite import: the newly imported information overwrites the information of the original user. It is recommended to use the incremental method. ', - 'import_list_text'=>'
  • User name and mailbox items are required
    • -
  • Click the content of the import item below to edit it temporarily. When editing a department, please note that each line of the Department is a parent-child relationship, and the previous line is the parent department of the next line
    • -
  • Items that do not need to be imported can be deleted by clicking "X" on the right
    • -
  • Click the import button to import the current project. Click the import all button to import all items in sequence. You can click stop again in the middle
    • ', - // admin/orguser/tree.html - 'orguser_tree_delete'=>' Are you sure you want to delete this user completely (all of the user’s data and files will be completely deleted)? ', - 'orguser_tree_permission_delete'=>' Delete this user, only remove this user from the department, you may not have permission to operate this user after removal, are you sure you want to remove this user? ', - 'orguser_tree_batch_delete'=>' Organizations or departments do not support batch deletion ', - 'orguser_tree_all_delete'=>' Before deleting a department, you must delete all subordinate departments of this department and delete files in the shared directory. Are you sure you want to delete this department? ', - // admin/orguser/ajax.php - 'orguser_ajax_delete'=>' The user in the organization or department cannot be completely deleted, please delete from the organization or department first and try again ', - 'no_parallelism_jurisdiction'=>' no jurisdiction of the corresponding department ', - // admin/orguser/edituser.php - 'orguser_edituser_add_user'=>'
    sorry! You do not have permission to add users under this organization or department

    you can select the Department with permission on the left, and then try to add
    ', - 'orguser_edituser_add_user1'=>'
    sorry! You do not have administrative rights for this user

    you can select the user with permission management on the left side, and then retry adding
    ', - // admin/orguser/import.php - 'orguser_import_user'=>' No permission, only system administrators can import users ', - 'orguser_import_user_table'=>' Staff information table upload failed, please re-upload ', - 'orguser_import_xls_xlsx'=>' only XLS, XLSX files can be imported ', - 'orguser_import_user_message'=>' Staff information table uploaded successfully, going to import page ', - 'orguser_import_tautology'=>' Failed to upload info table, please try again later ', - 'orguser_import_user_message_table'=>' Please select the Personnel information table', - // admin/orguser/vidw.php - 'orguser_vidw_delete'=>'
    i’m sorry! You don’t have the administrative authority of this department!

    You can select the Department with permission management on the left
    ', // admin/setting/assistant.html 'assistant_app'=>'This application is the default application and can push messages to the whole company through it. For example, pay attention to the success notification, company documents, notifications, etc.', // admin/setting/main.html diff --git a/admin/language/zh-cn/lang.php b/admin/language/zh-cn/lang.php index a567bbd..f6f555a 100644 --- a/admin/language/zh-cn/lang.php +++ b/admin/language/zh-cn/lang.php @@ -14,10 +14,6 @@ if(!defined('IN_DZZ')) { $lang = array ( 'page_background'=>'登录背景', - 'share_enable_successful'=>'共享目录启用成功!', - 'share_close_successful'=>'共享目录关闭成功!', - 'group_on_successful'=>'群组功能开启成功!', - 'group_close_successful'=>'群组功能关闭成功!', 'database_export_custom_invalid' => '您至少需要选择一个数据表进行备份', 'database_export_file_invalid' => '数据文件无法保存到服务器，请检查目录属性', 'admin_navtitle'=>'管理中心', @@ -36,41 +32,15 @@ $lang = array 'cloud_type_ftp'=>'FTP', 'cloud_type_disk'=>'本地磁盘', - 'export_range_user'=>'选择导出范围,此范围内的所有用户都会导出', - 'export_data'=>'导出资料项', - 'compellation'=>'用户名', 'UserTrueName'=>'用户真实姓名', - 'phone_number'=>'手机号码', - 'phone_number_illegal'=>'手机号码不合法', - 'weixin_phone_number'=>'微信绑定的手机号码', - 'weixin_illegal'=>'微信号不合法', - 'user_weixin'=>'员工微信号', - 'weixin_exist'=>'微信号已经存在', - 'random_password'=>'生成随机密码', - 'exceptional_space'=>'额外空间', - 'disable_user'=>'停用此用户', - 'block_up'=>'停用', - 'set_system_administrator'=>'设为系统管理员', - 'add_a_item'=>'增加一项', - 'supervisor_position'=>'上司职位', - 'send_password_user_mailbox'=>'发送密码到用户邮箱', - 'login_email_required'=>'登录邮箱必填', - 'name_will'=>'用户名必填', - 'none_write_login_password'=>'还没有填写登录密码', - 'none_write_affirm_password'=>'还没有填写确认密码', 'none_write_add_theme'=>'还没有添加主题', 'illegal'=>'不合法', - 'space_not_change_password'=>'留空，不修改密码', 'data_set'=>'资料设置', 'user_name'=>'用户用户名', 'user_name_email'=>'用户名或邮箱', 'user_name_sensitive'=>'用户名含有敏感字符', 'avatar'=>'头像', 'space_usage'=>'空间使用', - 'department'=>'部门', - 'organization'=>'机构', - 'organization_department'=>'机构部门', - 'registration_time'=>'注册时间', 'data_item_list'=>'资料项列表', 'data_edit'=>'资料项编辑', 'identifier'=>'标识符', @@ -112,40 +82,11 @@ $lang = array 'user_phone_registered'=>'用户手机号码已经被注册', 'weixin_registered'=>'该微信号已经被注册', 'user_registered_retry'=>'该用户名已经被注册，请更换用户名再试', - 'add_user'=>'添加用户', - 'add_user_success'=>'添加用户成功', - 'edit_user_success'=>'修改用户信息成功', - 'email_registered_retry'=>'邮箱已经被注册，请更换邮箱再试', 'contact_administrator'=>'还没有启用实名认证,请联系管理员', 'contact_administrator1'=>'您没有实名认证权限,请联系管理员', 'contact_administrator2'=>'您没有认证权限,请联系管理员', 'contact_administrator3'=>'您没有资料审核权限,请联系管理员', - 'export_user'=>'导出用户', - 'shared_directory_set'=>'共享目录设置', - 'group_on_set'=>'群组功能设置', - 'shared_directory_desktop_shortcut'=>'共享目录桌面快捷方式', - 'position_management'=>'职位管理', - 'add_position'=>'添加职位', - 'position_name'=>'职位名称', 'organization_user_manage'=>'机构和用户管理', - 'bulking'=>'增量', - 'coverage'=>'覆盖', - 'import_nbsp'=>'导 入', - 'creation_agency'=>'新建机构', - 'creation_bottom_section'=>'新建下级部门', - 'creation_equally_section'=>'新建同级部门', - 'please_select_same_type_node'=>'请选择相同类型的节点', - 'please_select_same_section_node'=>'请选择相同部门的节点', - 'no_institution_users'=>'无机构用户', - 'add_administrator_unsuccess'=>'添加管理员失败', - 'no_open_Shared_directory'=>'没有开启共享目录，无法设置', - 'please_select_range_export'=>'请选择导出范围', - 'please_select_project_export'=>'请选择导出项目', - 'user_information_table'=>'人员信息表', - 'bulk_import_user_template'=>'批量导入用户模板', - 'name_email_empty'=>'用户名和邮箱不能为空', - 'lack_required_fields_name'=>'缺少必填字段"用户名"', - 'lack_required_fields_name_email'=>'缺少必填字段”用户名“或”邮箱“', 'enterprise_binding'=>'企业号绑定', 'enterprise_little_helper'=>'企业小助手', 'enterprise_little_helper_set'=>'企业小助手设置', @@ -259,7 +200,6 @@ $lang = array 'type_save_success'=>'分类保存成功！', 'already_update'=>'已更新', 'submit_tips' => '按 Enter 键可随时提交您的修改', - 'save_changes'=>'保存更改', 'starting_migration'=>'开始迁移', 'migration_completed'=>'迁移完成', 'routing_name'=>'路由名称', @@ -353,7 +293,6 @@ $lang = array 'file' => '文件', 'dir' => '目录', 'ip' => 'IP 地址', - 'usergroup' => '用户组', 'according_usergroup' => '按用户组', 'usernum' => '用户数：', 'admingroup' => '管理组', @@ -365,9 +304,6 @@ $lang = array 'current_contents_without_saving'=>'当前内容没有保存，确定要离开吗？', 'mail'=>'邮件设置', - 'login_username_placeholder'=>'登录用户名', - 'login_username_text'=>'必填，可用于系统登录', - 'required_used_login_system'=>'必填，可用于系统登录', // admin/system/database.html // 'nav_db' => '数据库', 'nav_db_export' => '备份', @@ -812,17 +748,6 @@ $lang = array 'main_matches_priority_text'=>'同一域名下的匹配顺序，数字越大，优先级越高。当匹配区域有重叠时设置此项', 'main_extensions'=>'特征后缀名', 'main_extensions_text'=>'设置此网址的特征后缀名，通过特征后缀名可以调用相应的应用打开此网址；如任务板的特征后缀可设置为：task', - // admin/member/adduser.html - 'adduser_login_email_text'=>'必填，可用于系统登录，员工关注企业号时，会根据邮箱来匹配。', - 'adduser_compellation_text'=>'必填，系统中显示，便于同事辨识', - 'adduser_phone_number_text'=>'选填，微信绑定的手机号码，员工关注企业号时，会根据员工微信绑定的手机来匹配。', - 'adduser_weixin_text'=>'选填，员工微信号，员工关注企业号时，会根据员工的微信号来匹配。', - 'adduser_exceptional_space_text'=>'单位M，额外增加用户存储空间（用户的总空间=默认空间+额外空间）', - 'adduser_disable_user_text'=>'用户停用后，该用户将不能登录系统，请谨慎操作', - 'adduser_usergroup_text'=>'设置用户为系统管理员后，此用户将拥有系统管理权限，请慎重！', - // admin/member/edituser.html - 'edituser_login_email_text'=>'选填，可用于系统登录，员工关注企业号时，会根据员工的邮箱来匹配。', - 'edituser_weixin_text'=>'选填，员工微信号，员工关注企业号时，会根据员工的微信号来匹配。如果已经关注，此项不能修改。', // admin/member/main.html 'member_main_delete'=>'确定要删除此用户吗？此用户的所有是数据和文件都将被清空，无法恢复', // admin/member/profileset.html @@ -839,79 +764,6 @@ $lang = array 'verifyset_verify_synopsis_text'=>'认证简单介绍，会在用户认证页面显示，支持UBB', 'verifyset_choosable_data_text'=>'注意：此处勾选的资料项只会在对应的认证页面显示，不在用户基本资料中显示，此认证未启用时也有效。', 'verifyset_verify_group_text'=>'设置允许参与认证的用户组，可以按住 CTRL 多选， 空代表都可以参于认证', - // admin/orguser/detail_org.html - 'export_excl'=>'导出此部门的所有用户到excl文件', - 'detail_org_no_enable'=>'如不启用，下级所有部门中将不能使用共享目录；启用后，企业盘才会显示共享目录。', - 'detail_org_explorerapp_enable'=>'开启后,可在网盘等应用中能够使用该机构或部门的目录。', - 'detail_org_enable'=>'启用后，企业盘机构下才会显示此部门的共享目录。', - 'detail_org_creation'=>'创建快捷方式后，所属成员桌面默认都会有相应快捷方式。', - 'group_org_no_enable'=>'开启后，资源管理器会显示该机构群组选项。', - 'group_org_enable'=>'不开启，资源管理器不会显示该机构群组选项。', - 'detail_org_administrator'=>'注： -
  • 机构管理员权限：设置本机构下所有部门管理员，管理本机构中所有人员，管理本机构所有共享目录。
    • -
  • 部门管理员权限：设置本部门下所有子部门管理员，管理本部门中所有人员，管理本部门所有共享目录。
    • ', - 'Select organization to set organization information'=>'选中机构为设置机构信息', - 'Select department to set department information'=>'选中部门为设置部门信息', - 'Select personnel to set personnel information'=>'选中人员为设置人员信息', - 'Personnel, departments and institutions can directly drag and move to change positions. Move refers to changing the Department to which the person belongs, and changing the superior organization or department of the Department.'=>'人员、部门、机构可直接拖拽移动更换位置。移动是更换人员所属部门、和更换部门上级机构或上级部门。', - 'Hold'=>'按住', - 'Key to move personnel or departments to copy. It is used to join personnel to multiple departments at the same time.'=>'键移动人员或部门为复制。用于将人员同时加入多个部门。', - 'Key can be used for multiple selections, and release after multiple selections'=>'键可多选，多选后松开', - 'Key movement is batch movement. Do not loosen'=>'键移动为批量移动。 不松开', - 'Right click departments, institutions and personnel to open the right-click menu. There are corresponding more operations in the menu.'=>'在部门、机构、人员上点鼠标右键可出现右键菜单。菜单中有对应的更多操作。', - 'Delete user description'=>'删除用户说明', - 'Deleting users from all institutions or departments is only removing users from their own institutions or departments. Users can no longer have all the use rights of their own institutions or departments. It is not deleting users from the system.'=>'所有机构、部门中删除用户，只是从本机构，或部门中移除，用户将不能再拥有本机构或部门的所有使用权限，不是将用户从系统中删除。', - 'When the system administrator deletes the user from the "list of non institutional users", the user will be completely deleted in the system, and all system data and saved files of the user will be deleted. Please use it cautiously by the administrator, and delete it after confirming that the member is to be deleted.'=>'系统管理员在“未加入机构用户列表”中删除用户，用户会在系统中彻底删除，并且删除用户所有系统数据及保存文件。请管理员谨慎使用，确定成员要删除后再删除。', - 'Key to move to batch copy.'=>'键移动为批量复制。', - 'Organization management instructions'=>'组织管理说明', - 'inport_guide_download'=>'下载人员信息导入模板', - 'inport_guide_template'=>'模板的项目会根据用户资料项的多少自动生成', - 'inport_guide_user.'=>'根据模板编辑需要人员信息表。', - 'inport_guide_step'=>'步骤3：选择excel表', - 'inport_guide_layout'=>'选择编辑好的人员信息表，支持 .xls、.xlsx格式', - 'inport_guide_notice'=>'编辑人员信息表注意事项', - '
  • 1. Edit the personnel information to be imported according to the template fields. If there is already a file information table, you only need to change the name of the relevant field in the existing file information table to be consistent with the name provided in the template. As long as the name corresponds, the position of the field does not affect the result -
  • 2. The "user name" field in the template is required, and other fields can be filled in as required -
  • 3. The information in the mailbox and user name fields in the table must be unique and cannot be duplicate. If the mailbox is empty, the system will randomly generate the mailbox address when importing -< Li class = "danger" > 4. Multi level department creation: Method 1: add multiple columns of "subordinate departments" to the table. From left to right, they are level-1 departments, level-2 departments and level-3 departments. The system will create departments, subordinate departments and lower subordinate departments according to the principle from left to right. Method 2: use a single column in the table, and the superior and subordinate departments use "/" to divide (for example, primary school / grade 1 / class 1) -
  • 5. Importing users can only import by organization. Multiple organizations need to be imported in batches -
  • 6. The "login password" field in the table can be blank, and administrators can set unified passwords for users in batches when importing. The user can modify the unified password after logging in -
  • 7. There are two import methods in the import interface: incremental and overwrite. Incremental method: when encountering the same user, only the missing field information of the user will be added, and the original information will not change. (for example, there is a user a in the system with a password of 123. In the batch import table, there is also a user a, whose unified password is set to ABC when importing. After importing, the passwords of other users are all ABC, and the original user a still keeps his original password, 123.) Overwrite import: completely replace the original user information in the system with the information in the table -
  • 8. If there are many people to import, it is recommended to make a test table for a small number of people first, and then import all users in an incremental way after the test is correct'=>'
  • 1、根据模板字段来编辑需要导入的人员信息，如果已经有档案信息表，则只需将现有的档案信息表中的相关字段名称改为与“模板”里提供的名称一致即可，只要名称对应，字段的位置不影响结果。
    • -
  • 2、模板中“用户名”字段必填，其他字段根据需要填写。
    • -
  • 3、表中“邮箱”、“用户名”字段中的信息必须是唯一的，不可重复。如果邮箱为空，系统导入时将随机生成邮箱地址。
    • -
  • 4、多级部门创建：方法1：表中添加多列“所属部门”，从左到右分别为一级部门、二级部门、三级部门，顺序排列，系统会根据从左到右的原则，依次创建部门、下级部门、下下级部门等。方法2：表格中使用单列，上下级部门使用“/”来分割（例如：小学/一年级/一班）。
    • -
  • 5、导入用户只能按机构导入，多个机构需要分批导入。
    • -
  • 6、表中“登录密码”字段可为空，管理员在导入时能够为用户批量设置统一的密码。用户使用统一密码登录后可自行修改。
    • -
  • 7、导入界面中有“增量”、“覆盖”两种导入方式。增量方式为：遇到相同用户，只会增加用户缺少的字段信息，原有信息不变。（例如：系统中已有用户A，密码为123。在批量导入表格中，也有用户A，导入时设置了统一密码为abc。导入完成后，其他用户的密码都为abc，原用户A还是保持他的原有密码，即123。）覆盖导入：将系统中原有的用户信息完全替换为表格中的信息。
    • -
  • 8、若需导入的人员较多，建议先做一个少量人员的测试表，测试无误后，再使用增量方式导入所有用户。
    • ', - 'import_list_organization'=>'选择要导入到的机构，如果不导入任何机构，会根据用户信息表中的所属部门来生成新的机构和部门，没有则会直接导入到"无机构人员"下', - 'import_list_password'=>'默认用户密码，当登录密码项未设置时，会使用此处设置的密码作为新导入的用户的密码', - 'import_list_coverage'=>'增量导入方式：新导入的用户信息智能的增加到原有用户信息中；覆盖导入：新导入的信息覆盖原有用户的信息,建议使用增量方式。', - 'import_list_text'=>'
  • 用户名和邮箱项目为必填项
    • -
  • 点击下面的导入项的内容，可以临时编辑，编辑部门时注意，部门每行是上下级的关系，上一行为下一行的上级部门
    • -
  • 不需要导入的项目，可以点击右侧的"X"删除掉
    • -
  • 点击导入按钮，导入当前项目，全部导入按钮，按顺序导入所有项，中途可以再次点击停止
    • ', - // admin/orguser/tree.html - 'orguser_tree_delete'=>'您确定要彻底删除此用户(用户的所有数据和文件都会彻底删除）吗？', - 'orguser_tree_permission_delete'=>'此处删除，仅从部门中移除此用户，移除后您可能没有操作此用户的权限，您确定要移除此用户吗？', - 'orguser_tree_batch_delete'=>'机构或部门不支持批量删除', - 'orguser_tree_all_delete'=>'删除部门前，必须先删除此部门的所有下级部门，并且删除共享目录中的文件，您确定要删除此部门吗？', - // admin/orguser/ajax.php - 'orguser_ajax_delete'=>'在机构或部门中的用户，不支持彻底删除，请先从机构或部门中删除后重试', - 'no_parallelism_jurisdiction'=>'没有对应部门的权限', - // admin/orguser/edituser.php - 'orguser_edituser_add_user'=>'
    抱歉！您没有在此机构或部门下添加用户的权限！

    可以在左侧选择有权限的部门，再重试添加
    ', - 'orguser_edituser_add_user1'=>'
    抱歉！您没有此用户的管理权限！

    可以在左侧选择有权限管理的用户，再重试添加
    ', - // admin/orguser/import.php - 'orguser_import_user'=>'没有权限，只有系统管理员才能导入用户', - 'orguser_import_user_table'=>'人员信息表上传未成功，请重新上传', - 'orguser_import_xls_xlsx'=>'只允许导入xls,xlsx类型的文件', - 'orguser_import_user_message'=>'人员信息表上传成功，正在调转到导入页面', - 'orguser_import_tautology'=>'上传信息表未成功，请稍候重试', - 'orguser_import_user_message_table'=>'请选择人员信息表', - // admin/orguser/vidw.php - 'orguser_vidw_delete'=>'
    抱歉！您没有此部门的管理权限！

    可以在左侧选择有权限管理的部门
    ', // admin/setting/assistant.html 'assistant_app'=>'该应用为默认应用，可以通过它向全公司范围推送消息。如关注成功通知，公司文件，通报等。', // admin/setting/main.html diff --git a/admin/member/template/profile.htm b/admin/member/template/profile.htm index 6af2142..ba2f5dc 100644 --- a/admin/member/template/profile.htm +++ b/admin/member/template/profile.htm @@ -7,17 +7,6 @@ overflow: hidden; background: #FBFBFB; } - - .bs-left-container { - width: 150px; - top: 0; - padding:0; - } - - .bs-main-container { - margin-left: 150px; - overflow: auto; - } diff --git a/admin/member/template/profileset.htm b/admin/member/template/profileset.htm index 110068e..78eb4cd 100644 --- a/admin/member/template/profileset.htm +++ b/admin/member/template/profileset.htm @@ -9,23 +9,11 @@ background: #FBFBFB; } - .bs-left-container { - width: 150px; - top: 0; - } - - .bs-main-container { - margin-left: 150px; - overflow: hidden; - padding:0; - } - .form-horizontal-left .radio-inline { margin: 0; } .itemContainer { - overflow: auto; padding: 0 5px 20px; } #table-header th:nth-child(6),#table-header th:nth-child(7){ diff --git a/admin/member/template/profileset_edit.htm b/admin/member/template/profileset_edit.htm index a8b3b41..6e8de47 100644 --- a/admin/member/template/profileset_edit.htm +++ b/admin/member/template/profileset_edit.htm @@ -12,17 +12,6 @@ text-shadow: 1px 1px 1px #FFF; } - .bs-left-container { - width: 150px; - top: 0; - } - - .bs-main-container { - margin-left: 150px; - overflow: auto; - padding:0; - } - .form-horizontal-left .radio-inline { margin: 0; } diff --git a/admin/member/template/verify.htm b/admin/member/template/verify.htm index 3c15d82..fcf8bee 100644 --- a/admin/member/template/verify.htm +++ b/admin/member/template/verify.htm @@ -9,18 +9,6 @@ overflow: hidden; background: #FBFBFB; } - - .bs-left-container { - width: 150px; - top: 0 - } - - .bs-main-container { - margin-left: 150px; - overflow: auto; - padding:0; - } - .form-horizontal-left .radio-inline { margin: 0; } diff --git a/admin/member/template/verifyset.htm b/admin/member/template/verifyset.htm index a2cd640..5718792 100644 --- a/admin/member/template/verifyset.htm +++ b/admin/member/template/verifyset.htm @@ -9,17 +9,6 @@ background: #FBFBFB; } - .bs-left-container { - width: 150px; - top: 0 - } - - .bs-main-container { - margin-left: 150px; - overflow: auto; - padding:0; - } - .form-horizontal .form-control { min-width: 90px; max-width: 250px; diff --git a/admin/member/template/verifyset_edit.htm b/admin/member/template/verifyset_edit.htm index c718824..008fde1 100644 --- a/admin/member/template/verifyset_edit.htm +++ b/admin/member/template/verifyset_edit.htm @@ -8,17 +8,6 @@ overflow: hidden; background: #FBFBFB; } - - .bs-left-container { - width: 150px; - top: 0 - } - - .bs-main-container { - margin-left: 120px; - overflow: auto; - } - .form-horizontal-left .checkbox-inline { margin: 0; diff --git a/admin/orguser/language/en-US/lang.php b/admin/orguser/language/en-US/lang.php deleted file mode 100644 index 2453300..0000000 --- a/admin/orguser/language/en-US/lang.php +++ /dev/null @@ -1,24 +0,0 @@ - 'Institutional users', - 'explorer_gropuperm'=>array( - 'Collaborative member ', - 'Administrator ', - 'The Founder' - ), - 'orgname'=>' Organization name', - 'orgname_placeholder'=>' Enter the institution name ', - 'change' => 'change', - 'org_description' => 'introduction', - 'org_description_placeholder'=>' Enter brief description of institutions ', - 'org_space_assign'=>' assign space size ', - 'org_space_assign_tip'=>' maximum available space that can be allocated ', - 'org_space_assign_tips'=>'
  • Unit m, left blank or 0 means no limit, - 1 means no space
  • limit the amount of space that can be used by the whole organization or department (including all subordinate departments) (the total amount of space used by all departments under the organization cannot exceed this limit)
  • the space allocated by a department can only be divided from the available space of the superior department; Once allocated, the remaining space of the superior department will be reduced accordingly, regardless of whether the allocated space is actually used up
    • ', - 'space_use_department'=>' department space usage ', - 'space_use_org'=>' total organization space usage ', - 'space_use_org_tips'=>'
  • Limit the space available to the entire organization or department (including all subordinate departments).
  • the space allocated by subordinate departments will be allocated from the available space of superior departments
    • ', - 'org_update_success'=>' Update data successfully, will jump for you in 3 seconds ', - 'org_img_uploaded_tip'=>' The image has been uploaded, just check it ', - 'clicktoupload'=>' clicktoupload' -); -?> \ No newline at end of file diff --git a/admin/orguser/language/zh-cn/lang.php b/admin/orguser/language/zh-cn/lang.php deleted file mode 100644 index 000b3ac..0000000 --- a/admin/orguser/language/zh-cn/lang.php +++ /dev/null @@ -1,24 +0,0 @@ - '机构用户', - 'explorer_gropuperm'=>array( - '协作成员', - '管理员', - '创始人' - ), - 'orgname'=>'机构名称', - 'orgname_placeholder'=>'输入机构(群组)名称', - 'change'=>'更换', - 'org_description'=>'简介', - 'org_description_placeholder'=>'输入机构(群组)简要介绍', - 'org_space_assign'=>'分配空间大小', - 'org_space_assign_tip'=>'当前可以分配的最大可用空间', - 'org_space_assign_tips'=>'
  • 单位M，留空或者0表示不限制，-1表示无空间
  • 限制整个机构或部门（包括下级所有部门）可以使用的空间大小(机构下所有部门的空间使用总和不能超过这个限制）
  • 部门分配的空间只能从上级部门的可用空间里面划分；一旦分配，上级部门的剩余空间就会相应减少，不管这些分配的空间是否实际使用完
    • ', - 'space_use_department'=>'部门空间使用', - 'space_use_org'=>'机构总空间使用', - 'space_use_org_tips'=>'
  • 限制整个机构或部门（包括下级所有部门）可以使用的空间大小
  • 下级部门分配的空间会从上级的可用空间里面分配
    • ', - 'org_update_success'=>'更新资料成功,3秒后将为您跳转', - 'org_img_uploaded_tip'=>'该图片已经上传过了，只需勾选即可', - 'clicktoupload'=>'点击上传' -); -?> \ No newline at end of file diff --git a/admin/orguser/template/import_list.htm b/admin/orguser/template/import_list.htm deleted file mode 100644 index 824d2c6..0000000 --- a/admin/orguser/template/import_list.htm +++ /dev/null @@ -1,211 +0,0 @@ - - - - - - -
    -
    - -
    -
    -
    -
    -
    - -
    -
    - - - -
    -
    - {lang import_list_organization}
    -
    - -
    - -
    - {lang import_list_password}
    - -
    - -
    - - -
    - {lang import_list_coverage}
    - -
    -
      - {lang import_list_text} -
    -
    -
    - - - - - - - - - - {eval $i=0;} - - - - - - - - - - - - - {eval $i++;} - - -
    $h0[$value]
    -

    $value2

    -

    $value[$value1]

    		 -     
    -
    -
    - - - diff --git a/admin/setting/index.php b/admin/setting/index.php index 93df2af..777d1b3 100644 --- a/admin/setting/index.php +++ b/admin/setting/index.php @@ -80,6 +80,7 @@ if (!submitcheck('settingsubmit')) { } elseif ($operation == 'access') { $navtitle = lang('loginSet').' - '.lang('appname'); $setting['strongpw'] = dunserialize($setting['strongpw']); + $setting['welcomemsgtitle'] = cutstr(trim(dhtmlspecialchars($setting['welcomemsgtitle'])), 75); }elseif($operation == 'space'){//获取空间设置结果 $navtitle=lang('spaceSet').' - '.lang('appname'); $openarr=json_encode(array('orgids'=>$open)); diff --git a/admin/setting/template/main.htm b/admin/setting/template/main.htm index 9af05f0..2fd4e72 100644 --- a/admin/setting/template/main.htm +++ b/admin/setting/template/main.htm @@ -385,6 +385,17 @@
  • 注意是填整数
    • + +
    +
    通知重复
    +
    + + +
      +
    • 关闭之后同一应用同一用户时覆盖原上条消息后接收
      • +
    • 开启之后任何消息不覆盖上条消息进行接收
      • +
    +
    @@ -755,6 +766,25 @@
    {lang mandatory_password_complexity_state}
    +
    +
    欢迎信息标题
    +
    + + 系统发送的欢迎信息的标题，不支持 HTML，不超过 75 字节。
    +
    +
    +
    欢迎信息内容
    +
    + + 系统发送的欢迎信息的内容。标题内容均支持变量替换，可以使用如下变量: +
  • {username} : 用户名
    • +
  • {time} : 发送时间
    • +
  • {sitename} : 网站名称（显示在页面底部的联系方式处的名称）
    • +
  • {bbname} : 站点名称（显示在浏览器窗口标题等位置的名称）
    • +
  • {adminemail} : 管理员 Email
    • +     +
    +
    {lang according_site_terms_service}
    diff --git a/admin/system/template/xtxx.htm b/admin/system/template/xtxx.htm index a77e769..9b43e69 100644 --- a/admin/system/template/xtxx.htm +++ b/admin/system/template/xtxx.htm @@ -28,23 +28,38 @@
    +

    用户信息

    + + + + + + + + + + + + + +
    在线人数用户人数停用人数
    $zaixianrenshu$yonghurenshu$tingyongrenshu

    版本信息

    - - - - - - - - - + + + + + + + + +
    官方版本小胡版本小胡版更新日期
    $about[version]$about[xhversion]$about[XHFIXBUG]
    官方版本小胡版本小胡版更新日期
    $about[version]$about[xhversion]$about[XHFIXBUG]
    - -
  • 已安装扩展:$extensions
    • + +
  • 已安装扩展:$extensions
    • diff --git a/admin/system/xtxx.php b/admin/system/xtxx.php index cbefc45..9ae8ac4 100644 --- a/admin/system/xtxx.php +++ b/admin/system/xtxx.php @@ -155,5 +155,8 @@ $extensions = ''; foreach ($loaded_extensions as $key => $value) { $extensions .= $value . ', '; } +$zaixianrenshu = DB::result_first("SELECT COUNT(*) FROM " . DB::table('session') . " WHERE uid"); +$yonghurenshu = DB::result_first("SELECT COUNT(*) FROM " . DB::table('user') . " WHERE uid"); +$tingyongrenshu = DB::result_first("SELECT COUNT(*) FROM " . DB::table('user') . " WHERE status"); include template('xtxx'); ?> diff --git a/core/class/dzz/dzz_app.php b/core/class/dzz/dzz_app.php index 8d552c9..2a43646 100644 --- a/core/class/dzz/dzz_app.php +++ b/core/class/dzz/dzz_app.php @@ -592,18 +592,14 @@ class dzz_app extends dzz_base{ if($this->var['member']['adminid']){ }elseif($appidxu['available']==0){ showmessage(lang('您无权使用该应用，请联系管理员。')); - }elseif ($appidxu['group']==0){ - }elseif ($appidxu['group']==-1){ - if ($this->var['member']['uid']){ - showmessage(lang('您无权使用该应用，请联系管理员。')); - } - }elseif ($this->var['member']['uid']){ + }elseif($this->var['member']['uid']){ $appuid= C::t('user_field')->fetch($this->var['member']['uid']); $appuidz=explode(',',$appuid['applist']); if (in_array($appidxu['appid'],$appuidz)){ }else{ showmessage(lang('您无权使用该应用，请联系管理员。')); } + }elseif($appidxu['group']==0 || $appidxu['group']==-1){ }else{ Hook::listen('check_login'); } diff --git a/core/class/dzz/dzz_notification.php b/core/class/dzz/dzz_notification.php index ebff186..6bbae8d 100644 --- a/core/class/dzz/dzz_notification.php +++ b/core/class/dzz/dzz_notification.php @@ -28,9 +28,10 @@ class dzz_notification { $title=lang($note.'_title',$notevars,'',$langfolder); $oldnote = array(); - //if($notevars['from_id'] && $notevars['from_idtype']) { + + if(!$_G['setting']['Duplicatenotification']) { $oldnote = C::t('notification')->fetch_by_fromid_uid_type($notevars['from_id'], $notevars['from_idtype'], $touid,$type); - //} + } if(empty($oldnote['from_num'])) $oldnote['from_num'] = 0; $notevars['from_num'] = (isset($notevars['from_num'])&& $notevars['from_num']) ? $notevars['from_num'] : 1; diff --git a/core/class/dzz/route.php b/core/class/dzz/route.php index 5128be4..b7a4879 100644 --- a/core/class/dzz/route.php +++ b/core/class/dzz/route.php @@ -72,6 +72,7 @@ class Route{ define('MOD_DIR',dirname($modfile)); define('MOD_URL',BASESCRIPT.'?mod='.$mod); define('OP_NAME',$op); + define('MOD_URLOP',MOD_URL.'&op='.$op); // $break = true; Hook::listen('mod_run'); return DZZ_ROOT.$modfile; diff --git a/core/core_version.php b/core/core_version.php index 62e3c04..55b6198 100644 --- a/core/core_version.php +++ b/core/core_version.php @@ -14,7 +14,7 @@ if(!defined('CORE_VERSION')) { define('CORE_VERSION', '2.02'); define('CORE_RELEASE', '20180909'); define('CORE_FIXBUG' , '20000000'); - define('CORE_XHVERSION', '1.72'); - define('CORE_XHRELEASE', '20230131'); - define('CORE_XHFIXBUG' , '20230131'); + define('CORE_XHVERSION', '1.74'); + define('CORE_XHRELEASE', '20230204'); + define('CORE_XHFIXBUG' , '20230204'); } \ No newline at end of file diff --git a/core/language/en-US/lang.php b/core/language/en-US/lang.php index a23e4a7..6dfb04b 100644 --- a/core/language/en-US/lang.php +++ b/core/language/en-US/lang.php @@ -1241,8 +1241,15 @@ Important! 'public_license'=>' Open source protocol ', 'community_edition'=>' Community Edition ', 'title_admincp'=>' Administrator Login entry ', - 'forbid_folder_TO_sub_folder '=>' The destination folder is a subfolder of the source folder' + 'forbid_folder_TO_sub_folder '=>' The destination folder is a subfolder of the source folder', + 'no_institution_users'=>' No institutional user', + 'compellation'=>' Username', + 'usergroup' => 'usergroup', + 'organization' => 'institutions', + 'department' => 'department', + 'save_changes'=>' save changes', + 'registration_time'=>' registration time', ); ?> \ No newline at end of file diff --git a/core/language/zh-cn/lang.php b/core/language/zh-cn/lang.php index 63ea501..6853610 100644 --- a/core/language/zh-cn/lang.php +++ b/core/language/zh-cn/lang.php @@ -1267,7 +1267,15 @@ $_G[siteurl]', 'public_license'=>'开源协议', 'community_edition'=>'社区版', 'title_admincp'=>'管理员登录入口', - 'forbid_folder_to_sub_folder'=>'目标文件夹是源文件夹的子文件夹' + 'forbid_folder_to_sub_folder'=>'目标文件夹是源文件夹的子文件夹', + + 'no_institution_users'=>'无机构用户', + 'compellation'=>'用户名', + 'usergroup' => '用户组', + 'organization'=>'机构', + 'department'=>'部门', + 'save_changes'=>'保存更改', + 'registration_time'=>'注册时间', ); ?> \ No newline at end of file diff --git a/core/template/default/common/header_right.htm b/core/template/default/common/header_right.htm index 85593e9..7b373da 100644 --- a/core/template/default/common/header_right.htm +++ b/core/template/default/common/header_right.htm @@ -1,18 +1,6 @@
      - {eval} - foreach($_G['setting']['verify'] as $key=>$value){ - $verify = C::t('user_verify')->fetch($_G['uid']); - if($value['available'] && $key==1){ - if($verify['verify1']==1){ - }else { - $kai=1; - } - } -} - {/eval} -
      • @@ -22,7 +10,6 @@   -
    • diff --git a/admin/orguser/ajax.php b/dzz/orguser/ajax.php similarity index 99% rename from admin/orguser/ajax.php rename to dzz/orguser/ajax.php index bb573e6..9a39bba 100644 --- a/admin/orguser/ajax.php +++ b/dzz/orguser/ajax.php @@ -6,7 +6,7 @@ * @link http://www.dzzoffice.com * @author zyx(zyx@dzz.cc) */ -if (!defined('IN_DZZ') || !defined('IN_ADMIN')) { +if (!defined('IN_DZZ')) { exit('Access Denied'); } include_once libfile('function/organization'); diff --git a/admin/orguser/edituser.php b/dzz/orguser/edituser.php similarity index 97% rename from admin/orguser/edituser.php rename to dzz/orguser/edituser.php index 986a499..36cf52f 100644 --- a/admin/orguser/edituser.php +++ b/dzz/orguser/edituser.php @@ -6,7 +6,7 @@ * @link http://www.dzzoffice.com * @author zyx(zyx@dzz.cc) */ -if (!defined('IN_DZZ') || !defined('IN_ADMIN')) { +if (!defined('IN_DZZ')) { exit('Access Denied'); } require_once libfile('function/user', '', 'user'); @@ -160,7 +160,7 @@ EOT; } } - showmessage('add_user_success', ADMINSCRIPT . '?mod=orguser#user_' . $uid, array('uid' => $uid, 'orgids' => $orgids)); + showmessage('add_user_success', MOD_URL.'#user_' . $uid, array('uid' => $uid, 'orgids' => $orgids)); } else { $orgid = intval($_GET['orgid']); @@ -210,7 +210,7 @@ EOT; //处理上司职位; C::t('organization_upjob') -> insert_by_uid($uid, intval($_GET['upjobid'])); - showmessage('edit_user_success', ADMINSCRIPT . '?mod=orguser#user_' . $uid, array()); + showmessage('edit_user_success', MOD_URL.'#user_' . $uid, array()); } @@ -312,7 +312,7 @@ EOT; C::t('organization_upjob') -> insert_by_uid($uid, intval($_GET['upjobid'])); Hook::listen('syntoline_user',$uid);//注册绑定到钉钉部门表 - showmessage('edit_user_success', ADMINSCRIPT . '?mod=orguser#user_' . $uid, array()); + showmessage('edit_user_success', MOD_URL.'#user_' . $uid, array()); } else { require_once libfile('function/organization'); @@ -413,7 +413,7 @@ EOT; $setarr['uid'] = $uid; C::t('user_profile') -> insert($setarr); } - showmessage('subscriber_data_alter_success', ADMINSCRIPT . '?mod=orguser#user_' . $uid . '_profile', array()); + showmessage('subscriber_data_alter_success', MOD_URL.'#user_' . $uid . '_profile', array()); } else { $allowitems = array(); foreach ($_G['cache']['profilesetting'] as $key => $value) { diff --git a/admin/orguser/export.php b/dzz/orguser/export.php similarity index 99% rename from admin/orguser/export.php rename to dzz/orguser/export.php index 5264a1c..c11eee5 100644 --- a/admin/orguser/export.php +++ b/dzz/orguser/export.php @@ -6,7 +6,7 @@ * @link http://www.dzzoffice.com * @author zyx(zyx@dzz.cc) */ -if(!defined('IN_DZZ') || !defined('IN_ADMIN')) { +if(!defined('IN_DZZ')) { exit('Access Denied'); } require_once libfile('function/organization'); diff --git a/admin/orguser/export_tmpl.php b/dzz/orguser/export_tmpl.php similarity index 98% rename from admin/orguser/export_tmpl.php rename to dzz/orguser/export_tmpl.php index 17847bb..e6f46d1 100644 --- a/admin/orguser/export_tmpl.php +++ b/dzz/orguser/export_tmpl.php @@ -6,7 +6,7 @@ * @link http://www.dzzoffice.com * @author zyx(zyx@dzz.cc) */ -if(!defined('IN_DZZ') || !defined('IN_ADMIN')) { +if(!defined('IN_DZZ')) { exit('Access Denied'); } $h0=array('username'=>lang('compellation'),'email'=>lang('email'),'password'=>lang('user_login_password'),'birth'=>lang('date_birth'),'gender'=>lang('gender'),'mobile'=>lang('cellphone'),'weixinid'=>lang('weixin'),'orgname'=>lang('category_department'),'job'=>lang('department_position')); diff --git a/admin/orguser/images/05group-topBg.jpg b/dzz/orguser/images/05group-topBg.jpg similarity index 100% rename from admin/orguser/images/05group-topBg.jpg rename to dzz/orguser/images/05group-topBg.jpg diff --git a/admin/orguser/images/add_guide.png b/dzz/orguser/images/add_guide.png similarity index 100% rename from admin/orguser/images/add_guide.png rename to dzz/orguser/images/add_guide.png diff --git a/admin/orguser/images/ctrl.png b/dzz/orguser/images/ctrl.png similarity index 100% rename from admin/orguser/images/ctrl.png rename to dzz/orguser/images/ctrl.png diff --git a/admin/orguser/images/icon-addPotr@2x.png b/dzz/orguser/images/icon-addPotr@2x.png similarity index 100% rename from admin/orguser/images/icon-addPotr@2x.png rename to dzz/orguser/images/icon-addPotr@2x.png diff --git a/admin/orguser/images/icons.png b/dzz/orguser/images/icons.png similarity index 100% rename from admin/orguser/images/icons.png rename to dzz/orguser/images/icons.png diff --git a/admin/orguser/images/icons_24.png b/dzz/orguser/images/icons_24.png similarity index 100% rename from admin/orguser/images/icons_24.png rename to dzz/orguser/images/icons_24.png diff --git a/admin/orguser/images/orguser.css b/dzz/orguser/images/orguser.css similarity index 99% rename from admin/orguser/images/orguser.css rename to dzz/orguser/images/orguser.css index 401c412..b926fa7 100644 --- a/admin/orguser/images/orguser.css +++ b/dzz/orguser/images/orguser.css @@ -21,7 +21,6 @@ position:relative; bottom:0px; left:0px; - background:#F7F7F7; border-bottom:1px solid #D2D2D2; border-top:1px solid #FFF; padding:7px 10px 3px 10px; diff --git a/admin/orguser/images/themes/default/32px.png b/dzz/orguser/images/themes/default/32px.png similarity index 100% rename from admin/orguser/images/themes/default/32px.png rename to dzz/orguser/images/themes/default/32px.png diff --git a/admin/orguser/images/themes/default/40px.png b/dzz/orguser/images/themes/default/40px.png similarity index 100% rename from admin/orguser/images/themes/default/40px.png rename to dzz/orguser/images/themes/default/40px.png diff --git a/admin/orguser/images/themes/default/organization.png b/dzz/orguser/images/themes/default/organization.png similarity index 100% rename from admin/orguser/images/themes/default/organization.png rename to dzz/orguser/images/themes/default/organization.png diff --git a/admin/orguser/images/themes/default/style.css b/dzz/orguser/images/themes/default/style.css similarity index 100% rename from admin/orguser/images/themes/default/style.css rename to dzz/orguser/images/themes/default/style.css diff --git a/admin/orguser/images/themes/default/style.min.css b/dzz/orguser/images/themes/default/style.min.css similarity index 100% rename from admin/orguser/images/themes/default/style.min.css rename to dzz/orguser/images/themes/default/style.min.css diff --git a/admin/orguser/images/themes/default/throbber.gif b/dzz/orguser/images/themes/default/throbber.gif similarity index 100% rename from admin/orguser/images/themes/default/throbber.gif rename to dzz/orguser/images/themes/default/throbber.gif diff --git a/admin/orguser/images/themes/default/user.png b/dzz/orguser/images/themes/default/user.png similarity index 100% rename from admin/orguser/images/themes/default/user.png rename to dzz/orguser/images/themes/default/user.png diff --git a/admin/orguser/images/user_bg.png b/dzz/orguser/images/user_bg.png similarity index 100% rename from admin/orguser/images/user_bg.png rename to dzz/orguser/images/user_bg.png diff --git a/admin/orguser/import.php b/dzz/orguser/import.php similarity index 98% rename from admin/orguser/import.php rename to dzz/orguser/import.php index 4f45e31..6ffb733 100644 --- a/admin/orguser/import.php +++ b/dzz/orguser/import.php @@ -6,7 +6,7 @@ * @link http://www.dzzoffice.com * @author zyx(zyx@dzz.cc) */ -if(!defined('IN_DZZ') || !defined('IN_ADMIN')) { +if(!defined('IN_DZZ')) { exit('Access Denied'); } require_once libfile('function/mail'); @@ -302,7 +302,7 @@ EOT; require_once DZZ_ROOT.'./core/class/class_PHPExcel.php'; $inputFileName = $_G['setting']['attachdir'].$_GET['file']; if(!is_file($inputFileName)){ - showmessage('orguser_import_user_table',ADMINSCRIPT.'?mod=orguser&op=import'); + showmessage('orguser_import_user_table',MOD_URL.'&op=import'); } $inputFileType = PHPExcel_IOFactory::identify($inputFileName); $objReader = PHPExcel_IOFactory::createReader($inputFileType); @@ -391,7 +391,7 @@ EOT; $url=outputurl($_G['siteurl'].MOD_URL.'&op=import&do=list&file='.urlencode($file)); @header("Location: $url"); exit(); - showmessage('orguser_import_user_message',outputurl($_G['siteurl'].MOD_URL.'?mod=orguser&op=import&do=list&file='.urlencode($file))); + showmessage('orguser_import_user_message',outputurl($_G['siteurl'].MOD_URL.'&op=import&do=list&file='.urlencode($file))); }else{ showmessage('orguser_import_tautology',dreferer()); } diff --git a/admin/orguser/index.php b/dzz/orguser/index.php similarity index 94% rename from admin/orguser/index.php rename to dzz/orguser/index.php index ee2ef7c..9907268 100644 --- a/admin/orguser/index.php +++ b/dzz/orguser/index.php @@ -6,7 +6,7 @@ * @link http://www.dzzoffice.com * @author zyx(zyx@dzz.cc) */ -if (!defined('IN_DZZ') || !defined('IN_ADMIN')) { +if (!defined('IN_DZZ')) { exit('Access Denied'); } $navtitle= lang('appname'); diff --git a/dzz/orguser/language/en-US/lang.php b/dzz/orguser/language/en-US/lang.php new file mode 100644 index 0000000..be1990d --- /dev/null +++ b/dzz/orguser/language/en-US/lang.php @@ -0,0 +1,164 @@ + 'Institutional users', + 'explorer_gropuperm'=>array( + 'Collaborative member ', + 'Administrator ', + 'The Founder' + ), + 'orgname'=>' Organization name', + 'orgname_placeholder'=>' Enter the institution name ', + 'change' => 'change', + 'org_description' => 'introduction', + 'org_description_placeholder'=>' Enter brief description of institutions ', + 'org_space_assign'=>' assign space size ', + 'org_space_assign_tip'=>' maximum available space that can be allocated ', + 'org_space_assign_tips'=>'
    • Unit m, left blank or 0 means no limit, - 1 means no space
    • limit the amount of space that can be used by the whole organization or department (including all subordinate departments) (the total amount of space used by all departments under the organization cannot exceed this limit)
    • the space allocated by a department can only be divided from the available space of the superior department; Once allocated, the remaining space of the superior department will be reduced accordingly, regardless of whether the allocated space is actually used up
      • ', + 'space_use_department'=>' department space usage ', + 'space_use_org'=>' total organization space usage ', + 'space_use_org_tips'=>'
    • Limit the space available to the entire organization or department (including all subordinate departments).
    • the space allocated by subordinate departments will be allocated from the available space of superior departments
      • ', + 'org_update_success'=>' Update data successfully, will jump for you in 3 seconds ', + 'org_img_uploaded_tip'=>' The image has been uploaded, just check it ', + 'clicktoupload'=>' clicktoupload', + // admin/orguser/tree.html + 'orguser_tree_delete'=>' Are you sure you want to delete this user completely (all of the user’s data and files will be completely deleted)? ', + 'orguser_tree_permission_delete'=>' Delete this user, only remove this user from the department, you may not have permission to operate this user after removal, are you sure you want to remove this user? ', + 'orguser_tree_batch_delete'=>' Organizations or departments do not support batch deletion ', + 'orguser_tree_all_delete'=>' Before deleting a department, you must delete all subordinate departments of this department and delete files in the shared directory. Are you sure you want to delete this department? ', + // admin/orguser/ajax.php + 'orguser_ajax_delete'=>' The user in the organization or department cannot be completely deleted, please delete from the organization or department first and try again ', + 'no_parallelism_jurisdiction'=>' no jurisdiction of the corresponding department ', + // admin/orguser/edituser.php + 'orguser_edituser_add_user'=>'
      sorry! You do not have permission to add users under this organization or department

      you can select the Department with permission on the left, and then try to add
      ', + 'orguser_edituser_add_user1'=>'
      sorry! You do not have administrative rights for this user

      you can select the user with permission management on the left side, and then retry adding
      ', + // admin/orguser/import.php + 'orguser_import_user'=>' No permission, only system administrators can import users ', + 'orguser_import_user_table'=>' Staff information table upload failed, please re-upload ', + 'orguser_import_xls_xlsx'=>' only XLS, XLSX files can be imported ', + 'orguser_import_user_message'=>' Staff information table uploaded successfully, going to import page ', + 'orguser_import_tautology'=>' Failed to upload info table, please try again later ', + 'orguser_import_user_message_table'=>' Please select the Personnel information table', + // admin/orguser/vidw.php + 'orguser_vidw_delete'=>'
      i’m sorry! You don’t have the administrative authority of this department!

      You can select the Department with permission management on the left
      ', + // admin/orguser/detail_org.html + 'export_excl'=>' Export all users of this department to an excL file ', + 'detail_org_no_enable'=>' If not enabled, all subordinate departments will not be able to use the shared directory; The shared directory is displayed on the enterprise disk only after this function is enabled. ', + 'detail_org_explorerapp_enable'=>' When enabled, the organization or department directory can be used in applications such as web disk. ', + 'detail_org_enable'=>' The shared directory of this department will be displayed in the enterprise disk organization only after the "detail_org_enable" function is enabled. ', + 'detail_org_creation'=>' When the detail_org_creation shortcut is created, the member desktop will have the shortcut by default. ', + 'group_org_no_enable'=>' After this function is enabled, Resource Manager will display the organization group option. ', + 'group_org_enable'=>' If not enabled, resource Manager will not display the organization group option. ', + 'detail_org_administrator'=>' Note: +
    • Authority of institution administrator: set administrators of all departments under the institution, manage all personnel in the institution, and manage all shared directories of the institution
      • +
    • Department Administrator permissions: set administrators of all sub departments under the Department, manage all personnel in the Department, and manage all shared directories of the Department
      • ', + 'Select organization to set organization information'=>' Select organization to set organization information', + 'Select department to set department information'=>' Select department to set department information', + 'Select personnel to set personnel information'=>' Select personnel to set personnel information', + 'Personnel, departments and institutions can directly drag and move to change positions. Move refers to changing the Department to which the person belongs, and Changing the superior organization or department of the department.'=>' People, departments, and organizations can be dragged and moved to change positions. The movement is to change the department of the personnel, and change the superior organization or superior department of the department. ', + 'Hold' => 'Hold', + 'Key to move personnel or departments to copy. It is used to join personnel to multiple departments at the same time.'=>'Key to move people or departments for replication. Add people to multiple departments at the same time.', + 'Key can be used for multiple selections, and release after multiple selections'=>'Key can be multi - selected, multi - selected after release', + 'Key movement is batch movement. Do not loosen'=>' Key to move for batch Loosen. Don’t loosen ', + 'Right click departments, institutions and personnel to open the right-click menu. There are corresponding more operations in the Menu.'=>' Right-click the department, organization, or personnel to display the right-click menu. There are more operations in the menu. ', + 'Delete user description'=>' Delete user description', + 'Deleting users from all institutions or departments is only removing users from their own institutions or departments. Users can no longer have all the use rights of their own institutions or departments. It is not deleting users from the system.'=>'If a user is deleted from an organization or department, the user cannot have all the permission to use the organization or department. This does not mean the user is deleted from the system.', + 'When the system administrator deletes the user from the "list of non institutional users", the user will be completely deleted in the system, and all system data and saved files of the user will be deleted. Please use it cautiously by the administrator, and delete it after confirming that the member is to be deleted.'=>'If the system administrator deletes a user from the User List, the user will be completely deleted from the system, and all system data and saved files of the user will be deleted. Use caution before deleting a member.', + 'Key to move to batch copy.'=>' Key to move to batch copy. ', + 'Organization management instructions'=>' Organization Management instructions', + 'inport_guide_download'=>' Download the person information import template ', + 'inport_guide_template'=>' template items will be automatically generated based on the number of user profile items ', + 'inport_guide_user.'=>' Edit the required personnel information table according to the template. ', + 'inport_guide_step'=>' Step 3: Select Excel ', + 'inport_guide_layout'=>' Select the edited staff layout, support. XLS,. XLSX format ', + 'inport_guide_notice'=>' Edit staff information sheet notes ', + '
    • 1. Edit the personnel information to be imported according to the template fields. If there is already a file information table, you only need to change the name of the relevant field in the existing file information table to be consistent with the name provided in the template. As long as the name corresponds, the position of the field does not affect the result
      • +
    • 2. The "user name" field in the template is required, and other fields can be filled in as required
      • +
    • 3. The information in the mailbox and user name fields in the table must be unique and cannot be duplicate. If the mailbox is empty, the system will randomly generate the mailbox address when importing
      • +
    • 4. Multi level department creation: Method 1: add multiple columns of "subordinate departments" to the table. From left to right, they are level-1 departments, level-2 departments and level-3 departments. The system will create departments, subordinate departments and lower subordinate departments according to the principle from left to right. Method 2: use a single column in the table, and the superior and subordinate departments use "/" to divide (for example, primary school / grade 1 / class 1)
      • +
    • 5. Importing users can only import by organization. Multiple organizations need to be imported in batches
      • +
    • 6. The "login password" field in the table can be blank, and administrators can set unified passwords for users in batches when importing. The user can modify the unified password after logging in
      • +
    • 7. There are two import methods in the import interface: incremental and overwrite. Incremental method: when encountering the same user, only the missing field information of the user will be added, and the original information will not change. (for example, there is a user a in the system with a password of 123. In the batch import table, there is also a user a, whose unified password is set to ABC when importing. After importing, the passwords of other users are all ABC, and the original user a still keeps his original password, 123.) Overwrite import: completely replace the original user information in the system with the information in the table
      • +
    • 8. If there are many people to import, it is recommended to make a test table for a small number of people first, and then import all users in an incremental way after the test is correct
      • '=>'
    • 1. Edit the personnel information to be imported according to the template fields. If there is already a file information table, you only need to change the name of the relevant field in the existing file information table to be consistent with the name provided in the template. As long as the name corresponds, the position of the field does not affect the result
      • +
    • 2. The "user name" field in the template is required, and other fields can be filled in as required
      • +
    • 3. The information in the mailbox and user name fields in the table must be unique and cannot be duplicate. If the mailbox is empty, the system will randomly generate the mailbox address when importing
      • +
    • 4. Multi level department creation: Method 1: add multiple columns of "subordinate departments" to the table. From left to right, they are level-1 departments, level-2 departments and level-3 departments. The system will create departments, subordinate departments and lower subordinate departments according to the principle from left to right. Method 2: use a single column in the table, and the superior and subordinate departments use "/" to divide (for example, primary school / grade 1 / class 1)
      • +
    • 5. Importing users can only import by organization. Multiple organizations need to be imported in batches
      • +
    • 6. The "login password" field in the table can be blank, and administrators can set unified passwords for users in batches when importing. The user can modify the unified password after logging in
      • +
    • 7. There are two import methods in the import interface: incremental and overwrite. Incremental method: when encountering the same user, only the missing field information of the user will be added, and the original information will not change. (for example, there is a user a in the system with a password of 123. In the batch import table, there is also a user a, whose unified password is set to ABC when importing. After importing, the passwords of other users are all ABC, and the original user a still keeps his original password, 123.) Overwrite import: completely replace the original user information in the system with the information in the table
      • +
    • 8. If there are many people to import, it is recommended to make a test table for a small number of people first, and then import all users in an incremental way after the test is correct
      • ', + 'import_list_organization'=>' select the organization to import. If no organization is imported, a new organization and department will be generated according to the Department in the user information table. If no organization is imported, it will be directly imported to "personnel without organization ', + 'import_list_password'=>' default user password. When the login password item is not set, the password set here will be used as the password of the newly imported user ', + 'import_list_coverage'=>' incremental import method: the newly imported user information is intelligently added to the original user information; Overwrite import: the newly imported information overwrites the information of the original user. It is recommended to use the incremental method. ', + 'import_list_text'=>'
    • User name and mailbox items are required
      • +
    • Click the content of the import item below to edit it temporarily. When editing a department, please note that each line of the Department is a parent-child relationship, and the previous line is the parent department of the next line
      • +
    • Items that do not need to be imported can be deleted by clicking "X" on the right
      • +
    • Click the import button to import the current project. Click the import all button to import all items in sequence. You can click stop again in the middle
      • ', + // admin/member/adduser.html + 'adduser_login_email_text'=>' This parameter is mandatory. It can be used for system login. When employees pay attention to the enterprise ID, the enterprise ID will be matched according to the email address. ', + 'adduser_compellation_text'=>' Required, displayed in system, easy to identify ', + 'adduser_phone_number_text'=>' Set this parameter to the mobile phone number bound to wechat. When an employee pays attention to the enterprise number, it will be matched according to the mobile phone bound to wechat. ', + 'adduser_weixin_text'=>' indicates the employee’s wechat ID. When an employee follows the enterprise ID, it will match according to the employee’s wechat ID. ', + 'adduser_exceptional_space_text'=>' Unit M, additional user storage space (total user space=default space + extra space) ', + 'adduser_disable_user_text'=>' After the user is disabled, the user cannot log in to the system. Perform this operation with caution ', + 'adduser_usergroup_text'=>' After you set the user as the system administrator, this user will have the system management rights. Please be cautious! ', + // admin/member/edituser.html + 'edituser_login_email_text'=>' This parameter is optional and can be used for system login. When employees pay attention to the enterprise number, it will be matched according to the employee’s email address. ', + 'edituser_weixin_text'=>' Select, employee’s wechat ID. When employees follow enterprise ID, it will be matched according to the employee’s wechat ID. If you have paid attention to it, this item cannot be modified. ', + 'supervisor_position'=>' supervisor position', + 'send_password_user_mailbox'=>' Send password to mailbox', + 'login_email_required'=>' Required for login ', + 'name_will'=>' username required ', + 'none_write_login_password'=>' No login password yet ', + 'none_write_affirm_password'=>' affirm_password has not been filled in ', + 'phone_number'=>' mobile phone number', + 'phone_number_illegal'=>' mobile phone number is illegal', + 'weixin_phone_number'=>' wechat bound mobile phone number', + 'weixin_illegal'=>' wechat illegal', + 'user_weixin'=>' employee weixin', + 'weixin_exist'=>' wechat already exists ', + 'random_password'=>' Generate random password', + 'exceptional_space'=>' extra space', + 'disable_user'=>' Disable this user', + 'block_up' => 'stop', + 'set_system_administrator'=>' Set as system administrator', + 'add_a_item'=>' add an item', + 'add_user'=>' Add user', + 'add_user_success'=>' User added successfully ', + 'edit_user_success'=>' Modify user information successfully ', + 'export_user'=>' Export user', + 'shared_directory_set'=>' shared directory setting ', + 'group_on_set'=>' Group function Settings ', + 'shared_directory_desktop_shortcut'=>' Shared directory desktop shortcut', + 'position_management'=>' position management', + 'add_position'=>' Add position', + 'position_name'=>' position name', + 'organization_department'=>' Organization Department', + 'share_enable_successful'=>' The shared directory is enabled successfully! ', + 'share_close_successful'=>' The shared directory is closed successfully! ', + 'group_on_successful'=>' The group function has been enabled successfully! ', + 'group_close_successful'=>' The group function is disabled successfully! ', + 'login_username_placeholder'=>' Login username ', + 'login_username_text'=>' required, available for system login ', + 'required_used_login_system'=>' required, available for system login ', + 'space_not_change_password'=>' Leave blank, do not change password', + 'export_range_user'=>' Select the export range, all users in this range will export ', + 'export_data'=>' Export data item ', + 'import_nbsp'=>'The import', + 'creation_agency'=>' New agency', + 'creation_bottom_section'=>' Create the bottom_section', + 'creation_equally_section'=>' New sibling department ', + 'please_select_same_type_node'=>' Please select a node of the same type ', + 'please_select_same_section_node'=>' Please select a node in the same department ', + 'add_administrator_unsuccess'=>' Failed to add administrator ', + 'no_open_Shared_directory'=>' cannot be set because the shared directory is not enabled ', + 'please_select_range_export'=>' Please select the export scope ', + 'please_select_project_export'=>' Please select export project ', + 'user_information_table'=>' Person information table', + 'bulk_import_user_template'=>' Import user templates in batches ', + 'name_email_empty'=>' Username and mailbox cannot be empty', + 'lack_required_fields_name'=>' lacks the required field "user name"', + 'lack_required_fields_name_email'=>'The required field user name or mailbox is missing', + 'bulking' => 'delta', + 'coverage' => 'cover', +); +?> \ No newline at end of file diff --git a/dzz/orguser/language/zh-cn/lang.php b/dzz/orguser/language/zh-cn/lang.php new file mode 100644 index 0000000..98a7883 --- /dev/null +++ b/dzz/orguser/language/zh-cn/lang.php @@ -0,0 +1,165 @@ + '机构用户', + 'explorer_gropuperm'=>array( + '协作成员', + '管理员', + '创始人' + ), + 'orgname'=>'机构名称', + 'orgname_placeholder'=>'输入机构(群组)名称', + 'change'=>'更换', + 'org_description'=>'简介', + 'org_description_placeholder'=>'输入机构(群组)简要介绍', + 'org_space_assign'=>'分配空间大小', + 'org_space_assign_tip'=>'当前可以分配的最大可用空间', + 'org_space_assign_tips'=>'
    • 单位M，留空或者0表示不限制，-1表示无空间
    • 限制整个机构或部门（包括下级所有部门）可以使用的空间大小(机构下所有部门的空间使用总和不能超过这个限制）
    • 部门分配的空间只能从上级部门的可用空间里面划分；一旦分配，上级部门的剩余空间就会相应减少，不管这些分配的空间是否实际使用完
      • ', + 'space_use_department'=>'部门空间使用', + 'space_use_org'=>'机构总空间使用', + 'space_use_org_tips'=>'
    • 限制整个机构或部门（包括下级所有部门）可以使用的空间大小
    • 下级部门分配的空间会从上级的可用空间里面分配
      • ', + 'org_update_success'=>'更新资料成功,3秒后将为您跳转', + 'org_img_uploaded_tip'=>'该图片已经上传过了，只需勾选即可', + 'clicktoupload'=>'点击上传', + // admin/orguser/detail_org.html + 'export_excl'=>'导出此部门的所有用户到excl文件', + 'detail_org_no_enable'=>'如不启用，下级所有部门中将不能使用共享目录；启用后，企业盘才会显示共享目录。', + 'detail_org_explorerapp_enable'=>'开启后,可在网盘等应用中能够使用该机构或部门的目录。', + 'detail_org_enable'=>'启用后，企业盘机构下才会显示此部门的共享目录。', + 'detail_org_creation'=>'创建快捷方式后，所属成员桌面默认都会有相应快捷方式。', + 'group_org_no_enable'=>'开启后，资源管理器会显示该机构群组选项。', + 'group_org_enable'=>'不开启，资源管理器不会显示该机构群组选项。', + 'detail_org_administrator'=>'注： +
    • 机构管理员权限：设置本机构下所有部门管理员，管理本机构中所有人员，管理本机构所有共享目录。
      • +
    • 部门管理员权限：设置本部门下所有子部门管理员，管理本部门中所有人员，管理本部门所有共享目录。
      • ', + 'Select organization to set organization information'=>'选中机构为设置机构信息', + 'Select department to set department information'=>'选中部门为设置部门信息', + 'Select personnel to set personnel information'=>'选中人员为设置人员信息', + 'Personnel, departments and institutions can directly drag and move to change positions. Move refers to changing the Department to which the person belongs, and changing the superior organization or department of the Department.'=>'人员、部门、机构可直接拖拽移动更换位置。移动是更换人员所属部门、和更换部门上级机构或上级部门。', + 'Hold'=>'按住', + 'Key to move personnel or departments to copy. It is used to join personnel to multiple departments at the same time.'=>'键移动人员或部门为复制。用于将人员同时加入多个部门。', + 'Key can be used for multiple selections, and release after multiple selections'=>'键可多选，多选后松开', + 'Key movement is batch movement. Do not loosen'=>'键移动为批量移动。 不松开', + 'Right click departments, institutions and personnel to open the right-click menu. There are corresponding more operations in the menu.'=>'在部门、机构、人员上点鼠标右键可出现右键菜单。菜单中有对应的更多操作。', + 'Delete user description'=>'删除用户说明', + 'Deleting users from all institutions or departments is only removing users from their own institutions or departments. Users can no longer have all the use rights of their own institutions or departments. It is not deleting users from the system.'=>'所有机构、部门中删除用户，只是从本机构，或部门中移除，用户将不能再拥有本机构或部门的所有使用权限，不是将用户从系统中删除。', + 'When the system administrator deletes the user from the "list of non institutional users", the user will be completely deleted in the system, and all system data and saved files of the user will be deleted. Please use it cautiously by the administrator, and delete it after confirming that the member is to be deleted.'=>'系统管理员在“未加入机构用户列表”中删除用户，用户会在系统中彻底删除，并且删除用户所有系统数据及保存文件。请管理员谨慎使用，确定成员要删除后再删除。', + 'Key to move to batch copy.'=>'键移动为批量复制。', + 'Organization management instructions'=>'组织管理说明', + 'inport_guide_download'=>'下载人员信息导入模板', + 'inport_guide_template'=>'模板的项目会根据用户资料项的多少自动生成', + 'inport_guide_user.'=>'根据模板编辑需要人员信息表。', + 'inport_guide_step'=>'步骤3：选择excel表', + 'inport_guide_layout'=>'选择编辑好的人员信息表，支持 .xls、.xlsx格式', + 'inport_guide_notice'=>'编辑人员信息表注意事项', + '
    • 1. Edit the personnel information to be imported according to the template fields. If there is already a file information table, you only need to change the name of the relevant field in the existing file information table to be consistent with the name provided in the template. As long as the name corresponds, the position of the field does not affect the result +
    • 2. The "user name" field in the template is required, and other fields can be filled in as required +
    • 3. The information in the mailbox and user name fields in the table must be unique and cannot be duplicate. If the mailbox is empty, the system will randomly generate the mailbox address when importing +< Li class = "danger" > 4. Multi level department creation: Method 1: add multiple columns of "subordinate departments" to the table. From left to right, they are level-1 departments, level-2 departments and level-3 departments. The system will create departments, subordinate departments and lower subordinate departments according to the principle from left to right. Method 2: use a single column in the table, and the superior and subordinate departments use "/" to divide (for example, primary school / grade 1 / class 1) +
    • 5. Importing users can only import by organization. Multiple organizations need to be imported in batches +
    • 6. The "login password" field in the table can be blank, and administrators can set unified passwords for users in batches when importing. The user can modify the unified password after logging in +
    • 7. There are two import methods in the import interface: incremental and overwrite. Incremental method: when encountering the same user, only the missing field information of the user will be added, and the original information will not change. (for example, there is a user a in the system with a password of 123. In the batch import table, there is also a user a, whose unified password is set to ABC when importing. After importing, the passwords of other users are all ABC, and the original user a still keeps his original password, 123.) Overwrite import: completely replace the original user information in the system with the information in the table +
    • 8. If there are many people to import, it is recommended to make a test table for a small number of people first, and then import all users in an incremental way after the test is correct'=>'
    • 1、根据模板字段来编辑需要导入的人员信息，如果已经有档案信息表，则只需将现有的档案信息表中的相关字段名称改为与“模板”里提供的名称一致即可，只要名称对应，字段的位置不影响结果。
      • +
    • 2、模板中“用户名”字段必填，其他字段根据需要填写。
      • +
    • 3、表中“邮箱”、“用户名”字段中的信息必须是唯一的，不可重复。如果邮箱为空，系统导入时将随机生成邮箱地址。
      • +
    • 4、多级部门创建：方法1：表中添加多列“所属部门”，从左到右分别为一级部门、二级部门、三级部门，顺序排列，系统会根据从左到右的原则，依次创建部门、下级部门、下下级部门等。方法2：表格中使用单列，上下级部门使用“/”来分割（例如：小学/一年级/一班）。
      • +
    • 5、导入用户只能按机构导入，多个机构需要分批导入。
      • +
    • 6、表中“登录密码”字段可为空，管理员在导入时能够为用户批量设置统一的密码。用户使用统一密码登录后可自行修改。
      • +
    • 7、导入界面中有“增量”、“覆盖”两种导入方式。增量方式为：遇到相同用户，只会增加用户缺少的字段信息，原有信息不变。（例如：系统中已有用户A，密码为123。在批量导入表格中，也有用户A，导入时设置了统一密码为abc。导入完成后，其他用户的密码都为abc，原用户A还是保持他的原有密码，即123。）覆盖导入：将系统中原有的用户信息完全替换为表格中的信息。
      • +
    • 8、若需导入的人员较多，建议先做一个少量人员的测试表，测试无误后，再使用增量方式导入所有用户。
      • ', + 'import_list_organization'=>'选择要导入到的机构，如果不导入任何机构，会根据用户信息表中的所属部门来生成新的机构和部门，没有则会直接导入到"无机构人员"下', + 'import_list_password'=>'默认用户密码，当登录密码项未设置时，会使用此处设置的密码作为新导入的用户的密码', + 'import_list_coverage'=>'增量导入方式：新导入的用户信息智能的增加到原有用户信息中；覆盖导入：新导入的信息覆盖原有用户的信息,建议使用增量方式。', + 'import_list_text'=>'
    • 用户名和邮箱项目为必填项
      • +
    • 点击下面的导入项的内容，可以临时编辑，编辑部门时注意，部门每行是上下级的关系，上一行为下一行的上级部门
      • +
    • 不需要导入的项目，可以点击右侧的"X"删除掉
      • +
    • 点击导入按钮，导入当前项目，全部导入按钮，按顺序导入所有项，中途可以再次点击停止
      • ', + // admin/orguser/tree.html + 'orguser_tree_delete'=>'您确定要彻底删除此用户(用户的所有数据和文件都会彻底删除）吗？', + 'orguser_tree_permission_delete'=>'此处删除，仅从部门中移除此用户，移除后您可能没有操作此用户的权限，您确定要移除此用户吗？', + 'orguser_tree_batch_delete'=>'机构或部门不支持批量删除', + 'orguser_tree_all_delete'=>'删除部门前，必须先删除此部门的所有下级部门，并且删除共享目录中的文件，您确定要删除此部门吗？', + // admin/orguser/ajax.php + 'orguser_ajax_delete'=>'在机构或部门中的用户，不支持彻底删除，请先从机构或部门中删除后重试', + 'no_parallelism_jurisdiction'=>'没有对应部门的权限', + // admin/orguser/edituser.php + 'orguser_edituser_add_user'=>'
      抱歉！您没有在此机构或部门下添加用户的权限！

      可以在左侧选择有权限的部门，再重试添加
      ', + 'orguser_edituser_add_user1'=>'
      抱歉！您没有此用户的管理权限！

      可以在左侧选择有权限管理的用户，再重试添加
      ', + // admin/orguser/import.php + 'orguser_import_user'=>'没有权限，只有系统管理员才能导入用户', + 'orguser_import_user_table'=>'人员信息表上传未成功，请重新上传', + 'orguser_import_xls_xlsx'=>'只允许导入xls,xlsx类型的文件', + 'orguser_import_user_message'=>'人员信息表上传成功，正在调转到导入页面', + 'orguser_import_tautology'=>'上传信息表未成功，请稍候重试', + 'orguser_import_user_message_table'=>'请选择人员信息表', + // admin/orguser/vidw.php + 'orguser_vidw_delete'=>'
      抱歉！您没有此部门的管理权限！

      可以在左侧选择有权限管理的部门
      ', + // admin/member/adduser.html + 'adduser_login_email_text'=>'必填，可用于系统登录，员工关注企业号时，会根据邮箱来匹配。', + 'adduser_compellation_text'=>'必填，系统中显示，便于同事辨识', + 'adduser_phone_number_text'=>'选填，微信绑定的手机号码，员工关注企业号时，会根据员工微信绑定的手机来匹配。', + 'adduser_weixin_text'=>'选填，员工微信号，员工关注企业号时，会根据员工的微信号来匹配。', + 'adduser_exceptional_space_text'=>'单位M，额外增加用户存储空间（用户的总空间=默认空间+额外空间）', + 'adduser_disable_user_text'=>'用户停用后，该用户将不能登录系统，请谨慎操作', + 'adduser_usergroup_text'=>'设置用户为系统管理员后，此用户将拥有系统管理权限，请慎重！', + // admin/member/edituser.html + 'edituser_login_email_text'=>'选填，可用于系统登录，员工关注企业号时，会根据员工的邮箱来匹配。', + 'edituser_weixin_text'=>'选填，员工微信号，员工关注企业号时，会根据员工的微信号来匹配。如果已经关注，此项不能修改。', + 'supervisor_position'=>'上司职位', + 'send_password_user_mailbox'=>'发送密码到用户邮箱', + 'login_email_required'=>'登录邮箱必填', + 'name_will'=>'用户名必填', + 'none_write_login_password'=>'还没有填写登录密码', + 'none_write_affirm_password'=>'还没有填写确认密码', + 'phone_number'=>'手机号码', + 'phone_number_illegal'=>'手机号码不合法', + 'weixin_phone_number'=>'微信绑定的手机号码', + 'weixin_illegal'=>'微信号不合法', + 'user_weixin'=>'员工微信号', + 'weixin_exist'=>'微信号已经存在', + 'random_password'=>'生成随机密码', + 'exceptional_space'=>'额外空间', + 'disable_user'=>'停用此用户', + 'block_up'=>'停用', + 'set_system_administrator'=>'设为系统管理员', + 'add_a_item'=>'增加一项', + 'add_user'=>'添加用户', + 'add_user_success'=>'添加用户成功', + 'edit_user_success'=>'修改用户信息成功', + 'email_registered_retry'=>'邮箱已经被注册，请更换邮箱再试', + 'export_user'=>'导出用户', + 'shared_directory_set'=>'共享目录设置', + 'group_on_set'=>'群组功能设置', + 'shared_directory_desktop_shortcut'=>'共享目录桌面快捷方式', + 'position_management'=>'职位管理', + 'add_position'=>'添加职位', + 'position_name'=>'职位名称', + 'organization_department'=>'机构部门', + 'share_enable_successful'=>'共享目录启用成功!', + 'share_close_successful'=>'共享目录关闭成功!', + 'group_on_successful'=>'群组功能开启成功!', + 'group_close_successful'=>'群组功能关闭成功!', + 'login_username_placeholder'=>'登录用户名', + 'login_username_text'=>'必填，可用于系统登录', + 'required_used_login_system'=>'必填，可用于系统登录', + 'space_not_change_password'=>'留空，不修改密码', + 'export_range_user'=>'选择导出范围,此范围内的所有用户都会导出', + 'export_data'=>'导出资料项', + 'import_nbsp'=>'导 入', + 'creation_agency'=>'新建机构', + 'creation_bottom_section'=>'新建下级部门', + 'creation_equally_section'=>'新建同级部门', + 'please_select_same_type_node'=>'请选择相同类型的节点', + 'please_select_same_section_node'=>'请选择相同部门的节点', + 'add_administrator_unsuccess'=>'添加管理员失败', + 'no_open_Shared_directory'=>'没有开启共享目录，无法设置', + 'please_select_range_export'=>'请选择导出范围', + 'please_select_project_export'=>'请选择导出项目', + 'user_information_table'=>'人员信息表', + 'bulk_import_user_template'=>'批量导入用户模板', + 'name_email_empty'=>'用户名和邮箱不能为空', + 'lack_required_fields_name'=>'缺少必填字段"用户名"', + 'lack_required_fields_name_email'=>'缺少必填字段”用户名“或”邮箱“', + 'bulking'=>'增量', + 'coverage'=>'覆盖', +); +?> \ No newline at end of file diff --git a/admin/orguser/scripts/orguser.js b/dzz/orguser/scripts/orguser.js similarity index 100% rename from admin/orguser/scripts/orguser.js rename to dzz/orguser/scripts/orguser.js diff --git a/admin/orguser/template.xlsx b/dzz/orguser/template.xlsx similarity index 100% rename from admin/orguser/template.xlsx rename to dzz/orguser/template.xlsx diff --git a/admin/orguser/template/adduser.htm b/dzz/orguser/template/adduser.htm similarity index 99% rename from admin/orguser/template/adduser.htm rename to dzz/orguser/template/adduser.htm index e1f2946..5a8ad26 100644 --- a/admin/orguser/template/adduser.htm +++ b/dzz/orguser/template/adduser.htm @@ -22,7 +22,8 @@
      - {lang login_username_tips}
    + {lang login_username_tips} +
    diff --git a/admin/orguser/template/detail_org.htm b/dzz/orguser/template/detail_org.htm similarity index 97% rename from admin/orguser/template/detail_org.htm rename to dzz/orguser/template/detail_org.htm index be1f57e..d5a9b91 100644 --- a/admin/orguser/template/detail_org.htm +++ b/dzz/orguser/template/detail_org.htm @@ -21,7 +21,7 @@
    $org['orgname'] - {lang export_user} + {lang export_user}
    @@ -224,7 +224,7 @@ jQuery('textarea').TextAreaExpander(33); }); function set_submit(form) { - jQuery.post('$_G[siteurl]'+'admin.php?mod=orguser&op=ajax&do=orginfo',jQuery(form).serialize(), function (data) { + jQuery.post('$_G[siteurl]'+'{MOD_URL}&op=ajax&do=orginfo',jQuery(form).serialize(), function (data) { if (data['success']) { showmessage('{lang org_update_success}','success',3000,1); setTimeout(location.reload(),30000); @@ -255,7 +255,7 @@ function upload_bgphoto(obj,fact) { 'use strict'; jQuery(obj).fileupload({ - url: 'admin.php?mod=orguser&op=ajax&do=upload', + url: '{MOD_URL}&op=ajax&do=upload', dataType: 'json', autoUpload: true, maxFileSize: 2000000,// 2 MB diff --git a/admin/orguser/template/detail_user.htm b/dzz/orguser/template/detail_user.htm similarity index 94% rename from admin/orguser/template/detail_user.htm rename to dzz/orguser/template/detail_user.htm index 7b08f3b..c952ffc 100644 --- a/admin/orguser/template/detail_user.htm +++ b/dzz/orguser/template/detail_user.htm @@ -2,10 +2,10 @@ diff --git a/admin/orguser/template/edituser.htm b/dzz/orguser/template/edituser.htm similarity index 92% rename from admin/orguser/template/edituser.htm rename to dzz/orguser/template/edituser.htm index 3feed58..036f07f 100644 --- a/admin/orguser/template/edituser.htm +++ b/dzz/orguser/template/edituser.htm @@ -2,10 +2,10 @@ @@ -13,7 +13,7 @@
    -
    + @@ -37,7 +37,27 @@ {lang login_username_tips}
    - + +
    + +
    + +
    +
    +
    + +
    + $user[regip] +
    +
    + +
    + +
    + +
    +
    +
    diff --git a/admin/orguser/template/export.htm b/dzz/orguser/template/export.htm similarity index 91% rename from admin/orguser/template/export.htm rename to dzz/orguser/template/export.htm index edb458c..da1b1f0 100644 --- a/admin/orguser/template/export.htm +++ b/dzz/orguser/template/export.htm @@ -18,12 +18,12 @@
    - +
    diff --git a/admin/orguser/template/guide.htm b/dzz/orguser/template/guide.htm similarity index 77% rename from admin/orguser/template/guide.htm rename to dzz/orguser/template/guide.htm index 2db7da9..222bcc9 100644 --- a/admin/orguser/template/guide.htm +++ b/dzz/orguser/template/guide.htm @@ -5,8 +5,8 @@
  •  {lang Select department to set department information}
  •  {lang Select personnel to set personnel information}
  • {lang Personnel, departments and institutions can directly drag and move to change positions. Move refers to changing the Department to which the person belongs, and changing the superior organization or department of the Department.}
    • -
  • {lang Hold} {lang Key to move personnel or departments to copy. It is used to join personnel to multiple departments at the same time.}
    • -
  • {lang Hold} {lang Key can be used for multiple selections, and release after multiple selections} {lang Key movement is batch movement. Do not loosen} {lang Key to move to batch copy.}
    • +
  • {lang Hold} {lang Key to move personnel or departments to copy. It is used to join personnel to multiple departments at the same time.}
    • +
  • {lang Hold} {lang Key can be used for multiple selections, and release after multiple selections} {lang Key movement is batch movement. Do not loosen} {lang Key to move to batch copy.}
  • {lang Right click departments, institutions and personnel to open the right-click menu. There are corresponding more operations in the menu.}
    • diff --git a/admin/orguser/template/header_left.htm b/dzz/orguser/template/header_left.htm similarity index 69% rename from admin/orguser/template/header_left.htm rename to dzz/orguser/template/header_left.htm index c6c7968..763ca04 100644 --- a/admin/orguser/template/header_left.htm +++ b/dzz/orguser/template/header_left.htm @@ -1,6 +1,6 @@
    • - +
      diff --git a/admin/orguser/template/header_search.htm b/dzz/orguser/template/header_search.htm similarity index 100% rename from admin/orguser/template/header_search.htm rename to dzz/orguser/template/header_search.htm diff --git a/admin/orguser/template/import_guide.htm b/dzz/orguser/template/import_guide.htm similarity index 95% rename from admin/orguser/template/import_guide.htm rename to dzz/orguser/template/import_guide.htm index 8ca4527..54883b2 100644 --- a/admin/orguser/template/import_guide.htm +++ b/dzz/orguser/template/import_guide.htm @@ -27,13 +27,13 @@
      -

      {lang step}1：{lang inport_guide_download} +

      {lang step}1：{lang inport_guide_download} {lang inport_guide_template}

      {lang step}2：{lang inport_guide_user.}

      diff --git a/dzz/orguser/template/import_list.htm b/dzz/orguser/template/import_list.htm new file mode 100644 index 0000000..b6efd93 --- /dev/null +++ b/dzz/orguser/template/import_list.htm @@ -0,0 +1,216 @@ + + + + + + + +
      +
      +
      + +
      +
      +
      +
      +
      + +
      +
      + + + +
      +
      + {lang import_list_organization}
      +
      + +
      + +
      + {lang import_list_password}
      + +
      + +
      + + +
      + {lang import_list_coverage}
      + +
      +
        + {lang import_list_text} +
      +
      +
      + + + + + + + + + + {eval $i=0;} + + + + + + + + + + + + + {eval $i++;} + + +
      $h0[$value]
      +

      $value2

      +

      $value[$value1]

      		 +     
      +
      +
      +
      +
      + + + diff --git a/admin/orguser/template/main.htm b/dzz/orguser/template/main.htm similarity index 96% rename from admin/orguser/template/main.htm rename to dzz/orguser/template/main.htm index b30285b..8d9516c 100644 --- a/admin/orguser/template/main.htm +++ b/dzz/orguser/template/main.htm @@ -2,9 +2,9 @@ - + - +