diff --git a/cms/config/sql/mysql.initial.sql b/cms/config/sql/mysql.initial.sql index 5f79f29..86a93f4 100644 --- a/cms/config/sql/mysql.initial.sql +++ b/cms/config/sql/mysql.initial.sql @@ -263,4 +263,4 @@ INSERT INTO phpsqlitecms_settings (name, value) VALUES ('admin_language', 'engli INSERT INTO phpsqlitecms_settings (name, value) VALUES ('default_page_language', 'english'); INSERT INTO phpsqlitecms_settings (name, value) VALUES ('caching', '0'); INSERT INTO phpsqlitecms_settings (name, value) VALUES ('wysiwyg_editor', '0'); -INSERT INTO phpsqlitecms_userdata (name, type, pw, last_login, wysiwyg) VALUES('admin', 1, '75470d05abd21fb5e84e735d2bc595e2f7ecc5c7a5e98ad0d7', 1230764400, 0); +INSERT INTO phpsqlitecms_userdata (name, type, pw, last_login, wysiwyg) VALUES('admin', 1, '$6$rounds=5000$56748f4e35e993f6$nW05WLxf2aJGdiALJktlCvzrAXdxlvMLhRUmNAw1W42tqVLXoS0AGRrM41.sSRp3PrYpg4qsjOHGN22jKzPxA0', 1230764400, 0); diff --git a/cms/config/sql/postgresql.initial.sql b/cms/config/sql/postgresql.initial.sql index 137cbbb..48aa497 100644 --- a/cms/config/sql/postgresql.initial.sql +++ b/cms/config/sql/postgresql.initial.sql @@ -260,4 +260,4 @@ INSERT INTO phpsqlitecms_settings (name, value) VALUES ('default_page_language', INSERT INTO phpsqlitecms_settings (name, value) VALUES ('caching', '0'); INSERT INTO phpsqlitecms_settings (name, value) VALUES ('wysiwyg_editor', '0'); -INSERT INTO phpsqlitecms_userdata (name, type, pw, last_login, wysiwyg) VALUES('admin', 1, '75470d05abd21fb5e84e735d2bc595e2f7ecc5c7a5e98ad0d7', 1230764400, 0); +INSERT INTO phpsqlitecms_userdata (name, type, pw, last_login, wysiwyg) VALUES('admin', 1, '$6$rounds=5000$56748f4e35e993f6$nW05WLxf2aJGdiALJktlCvzrAXdxlvMLhRUmNAw1W42tqVLXoS0AGRrM41.sSRp3PrYpg4qsjOHGN22jKzPxA0', 1230764400, 0); diff --git a/cms/data/userdata.sqlite b/cms/data/userdata.sqlite index 57aaa8b..88005e6 100644 Binary files a/cms/data/userdata.sqlite and b/cms/data/userdata.sqlite differ diff --git a/cms/includes/functions.admin.inc.php b/cms/includes/functions.admin.inc.php index 570ef14..ba34e9a 100644 --- a/cms/includes/functions.admin.inc.php +++ b/cms/includes/functions.admin.inc.php @@ -7,10 +7,9 @@ */ function generate_pw_hash($pw) { - $salt = random_string(10,'0123456789abcdef'); - $salted_hash = sha1($pw.$salt); - $hash_with_salt = $salted_hash.$salt; - return $hash_with_salt; + $salt = bin2hex(openssl_random_pseudo_bytes(22)); + $hash = crypt($pw, '$6$rounds=5000$'.$salt.'$'); + return $hash; } /** @@ -29,6 +28,7 @@ function is_pw_correct($pw,$hash) if(sha1($pw.$salt)==$salted_hash) return true; else return false; } + elseif(crypt($pw, $hash) == $hash) return true; else return false; } diff --git a/cms/lang/chinese_zh-CN.admin.lang.php b/cms/lang/chinese_zh-CN.admin.lang.php new file mode 100644 index 0000000..4837933 --- /dev/null +++ b/cms/lang/chinese_zh-CN.admin.lang.php @@ -0,0 +1,483 @@ +[page] 上所有的评论?'; +$lang['delete_all_comments_subm'] = '确认 - 删除'; +$lang['comments_name_m'] = '名称:'; +$lang['comments_email_hp_m'] = '电子邮件或主页:'; +$lang['report_spam'] = '标记Spam'; +$lang['report_as_spam'] = '标记为Spam'; +$lang['report_spam_confirm'] = '你确定向 Akismet 报告 此评论为垃圾评论?'; +$lang['report_as_spam_submit'] = '标记为Spam'; +$lang['report_as_spam_delete_submit'] = '标记为Spam并且删除'; +$lang['pingback'] = 'Pingback'; + +# photos +$lang['photo_galleries'] = '相册'; +$lang['new_gallery'] = '新相册'; +$lang['edit_gallery'] = '[gallery]'; +$lang['edit_photo'] = '编辑图片'; +$lang['new_photo'] = '新图片'; +$lang['gallery_properties_hl'] = '属性'; +$lang['gallery_name_alr_exists'] = '相册已存在'; +$lang['error_gallery_spec_chars'] = '相册名称已存在'; +$lang['gallery'] = '相册'; +$lang['no_gallery'] = '还没有相册.'; +$lang['create_new_gallery'] = '创建相册'; +$lang['photo_overview'] = '图片预览'; +$lang['add_photo'] = '增加图片'; +$lang['photo'] = '图片'; +$lang['photo_nr'] = 'Nr.'; +$lang['photo_title'] = '标题'; +$lang['photo_subtitle'] = '子标题'; +$lang['photo_description'] = '描述'; +$lang['no_photo'] = '暂无图片.'; +$lang['delete_gallery'] = '删除相册'; +$lang['delete_gallery_confirm'] = '删除相册?'; +$lang['delete_gallery_submit'] = '确认 - 删除'; +$lang['new_gallery_name'] = '相册名称 (不能包含特殊字符):'; +$lang['edit_photo_thumbnail'] = '缩略:'; +$lang['edit_photo_normal'] = '图片:'; +$lang['edit_photo_large'] = '大图片:'; +$lang['edit_photo_size_flash'] = '(仅 *.swf/*.flv 格式文件)'; +$lang['edit_photo_xlarge'] = '特大图片:'; +$lang['edit_photo_title'] = '标题:'; +$lang['edit_photo_subtitle'] = '子标题:'; +$lang['edit_photo_description'] = '描述:'; +$lang['invalid_photo'] = '图片无效!'; +$lang['error_no_gallery'] = '未指定相册'; +$lang['error_no_thumbnail'] = '未指定缩略图'; +$lang['error_no_photo'] = '未制定图片'; +$lang['error_no_photo_title'] = '未制定图片标题'; +$lang['select_image'] = '选择图片'; +$lang['err_photo_t_doesnt_exist'] = '缩略图不存在'; +$lang['err_image_type'] = '缩略图必须是图片格式 (JPG/PNG/GIF)'; +$lang['err_photo_n_doesnt_exist'] = '图片不存在'; +$lang['err_photo_l_doesnt_exist'] = 'Large photo doesn\'t exist'; +$lang['gallery_properties'] = '相册相册属性'; +$lang['specify_photo_tpl_m'] = '图片模板'; +$lang['photos_per_row'] = '每行几个图片'; +$lang['delete_photo_confirm'] = '删除这个图片?'; + +# user +$lang['users'] = '用户列表'; +$lang['user_name'] = '名称'; +$lang['user_type'] = '类型'; +$lang['type_0'] = '编辑'; +$lang['type_1'] = '管理'; +$lang['last_login'] = '上次登陆'; +$lang['no_users'] = '暂无用户.'; +$lang['create_user_account'] = '创建新用户'; +$lang['user_name_m'] = '用户名称:'; +$lang['pw_m'] = '密码:'; +$lang['pw_conf_m'] = '确认密码:'; +$lang['delete_user'] = '删除这个用户'; +$lang['delete_user_confirm'] = '删除这个用户?'; +$lang['delete_user_submit'] = '删除 - 删除用户'; +$lang['edit_userdata'] = '编辑用户资料'; +$lang['edit_userdata_name'] = '名称:'; +$lang['edit_userdata_type'] = '类型:'; +$lang['change_pw_old'] = '旧密码:'; +$lang['change_pw_new'] = '新密码:'; +$lang['change_pw_new_conf'] = '确认新密码:'; +$lang['change_pw_note'] = '(修改必填)'; +$lang['error_username_special_chars'] = '用户名称包含非法字符'; +$lang['error_username_alr_exists'] = '用户名称已存在'; +$lang['error_pw_doesnt_comply'] = '密码与确认密码不同'; +$lang['error_form_uncomplete'] = '你的表单没有填写完全'; +$lang['error_pw_wrong'] = '密码错误!'; +$lang['invalid_user_type'] = '无效的密码类型'; +$lang['rights_limitation_imposs'] = '你无法限制自己的权限'; +$lang['del_yourself_imposs'] = '你不能删除你自己.'; +$lang['userdata_saved_message'] = '用户资料已保存'; + +#filemanager +$lang['filemanager'] = '文件管理器'; +$lang['upload_file'] = '上传文件'; +$lang['directory'] = '文件夹:'; +$lang['no_files'] = '暂无文件列表.'; +$lang['file'] = '文件'; +$lang['file_type'] = '类型'; +$lang['file_size'] = '大小 (KB)'; +$lang['file_date'] = '日期'; +$lang['delete_file'] = '删除文件'; +$lang['delete_file_confirm'] = '删除这个文件?'; +$lang['delete_file_submit'] = '确认 - 删除文件'; +$lang['delete_file_error'] = '不能够删除这个文件'; +$lang['file_legend'] = '文件'; +$lang['upload_file_link'] = '上传文件'; +$lang['upload_file_label'] = '文件:'; +$lang['upload_directory_label'] = '上传到:'; +$lang['overwrite_file'] = '覆盖同名文件'; +$lang['image_options'] = '图片选项'; +$lang['upload_file_submit'] = '上传文件'; +$lang['filename_on_server'] = '文件保存名称:'; +$lang['filename_server_same'] = '留空则表示不修改'; +$lang['upload_file_exists'] = '存在一个相同名称的文件'; +$lang['error_no_file'] = '上传文件没有指定'; +$lang['upload_ok'] = '文件成功上传'; +$lang['delete_image_confirm'] = '确定删除这个图片文件?'; +$lang['delete_image_submit'] = '确认 - 删除'; +$lang['delete_image_cancel'] = '取消'; +$lang['upload_image_exists'] = '已存在同名图片文件'; +$lang['upload_overwrite_image'] = '覆盖同名文件'; +$lang['dont_manipulate_image'] = '保存原样'; +$lang['manipulate_image'] = '调整图片:'; +$lang['resize'] = '修正尺寸:'; +$lang['resize_width'] = '宽'; +$lang['resize_height'] = '高'; +$lang['compression'] = '压缩级别'; +$lang['compression_jpg_only'] = '(仅JPG格式支持)'; +$lang['image_name_on_server'] = '保存名称:'; +$lang['image_name_server_same'] = '(留空表示不修改)'; +$lang['error_no_image'] = '未指定上传图片文件'; +$lang['invalid_image_format'] = '无效的图片格式 ([format])'; +$lang['invalid_image_name'] = '无效的图片名称'; +$lang['invalid_compression_value'] = 'The value for the compression has to be between 1 and 100'; +$lang['create_thumbnail'] = '创建缩略图:'; + +# settings +$lang['settings'] = '设置'; +$lang['advanced_settings'] = '高级设置'; +$lang['settings_website_title'] = '网站标题'; +$lang['settings_website_subtitle'] = '子标题'; +$lang['settings_author'] = '作者'; +$lang['settings_website_address'] = 'URL'; +$lang['settings_email'] = 'E-mail'; +$lang['settings_index_page'] = '默认页'; +$lang['settings_error_page'] = '错误页'; +$lang['default_page_language'] = '默认语言'; +$lang['admin_language'] = '后台语言'; +$lang['settings_caching'] = '缓存'; +$lang['settings_caching_enabled'] = '开启缓存'; +$lang['settings_name'] = '名称'; +$lang['settings_value'] = '值'; +$lang['add_new_setting_var'] = '增加新值'; +$lang['error_settings_spec_chars'] = '新变量名称包含非法字符'; +$lang['delete_setting_confirm'] = '删除这个设置?'; +$lang['settings_saved'] = '设置已保存'; + +# spam protection +$lang['spam_protection'] = '反垃圾'; +$lang['akismet'] = 'Akismet'; +$lang['akismet_desc'] = 'Akismet 反垃圾'; +$lang['akismet_key'] = 'Wordpress API Key:'; +$lang['akismet_entry_check'] = '检测评论'; +$lang['akismet_mail_check'] = '检测邮件地址'; +$lang['banned_ips'] = '已禁止的IPs列表'; +$lang['banned_ips_desc'] = '禁止的IP地址、IP段 (e.g. 10.10.1.*)与合法的IP/掩码 (e.g. 10.10.1.32/27)。 每行一个.'; +$lang['banned_user_agents'] = '已禁止的浏览器标志'; +$lang['banned_user_agents_desc'] = '禁止的浏览器标志. 每行一个.'; +$lang['not_accepted_words'] = '已禁止的词语列表'; +$lang['not_accepted_words_desc'] = '禁止出现在内容与联系人名称的词. 每行一个.'; +$lang['spam_protection_submit'] = '确认 - 保存'; +$lang['spam_protection_saved'] = '已保存'; +$lang['error_own_ip_banned'] = '你禁止了自己的IP!'; +$lang['error_own_user_agent_banned'] = '你禁止了自己的浏览器标志!'; + +# insert_image +$lang['insert_image'] = '插入图片'; +$lang['select_image_title'] = '插入图片'; +$lang['insert_image_button'] = '插入图片'; +$lang['insert_thumbnail_button'] = '插入图片缩略图'; +$lang['default_image_alt'] = '图片'; +$lang['upload_submit'] = '确认 - 上传图片'; +$lang['upload_image'] = '上传图片'; +$lang['upload_image_marking'] = '选择图片:'; +$lang['available_images'] = '有效的图片'; +$lang['no_images'] = '暂无图片'; +$lang['insert_thumbnail'] = '插入图片缩略图'; +$lang['thumbnail_select_gallery'] = '选择相册:'; +$lang['insert_image_label'] = '插入图片'; +$lang['insert_thumbnail_label'] = '插入图片缩略图'; +$lang['insert_gallery_label'] = '插入相册'; +$lang['insert_image_class'] = '样式类名称:'; +$lang['insert_image_alt'] = '描述文本:'; +$lang['insert_image_width_height'] = '宽/高:'; +$lang['delete_error'] = '删除时发生错误'; +$lang['upload_error'] = '上传时发生错误 - 请检查图片所在相册的读写权限!'; +?> + diff --git a/cms/lang/chinese_zh-CN.page.lang.php b/cms/lang/chinese_zh-CN.page.lang.php new file mode 100644 index 0000000..e6c0a78 --- /dev/null +++ b/cms/lang/chinese_zh-CN.page.lang.php @@ -0,0 +1,147 @@ +Last modified: [last_modified|%Y-%m-%d, %H:%M]'; +$lang['no_comments'] = '暂无评论'; +$lang['one_comment'] = '一条评论'; +$lang['several_comments'] = '[comments] 条评论'; +$lang['number_of_comments'][0] = '暂无评论'; +$lang['number_of_comments'][1] = '一条评论'; +$lang['number_of_comments'][2] = '[comments] 条评论'; +$lang['pagination'] = '当前位于[current_page]/[total_pages]页'; +$lang['edit'] = '编辑'; +$lang['delete'] = '删除'; +$lang['all_categories'] = '显示全部分类'; + +// Admin Menu: +$lang['admin_menu_home'] = '首页'; +$lang['admin_menu_admin'] = '管理面板'; +$lang['admin_menu_page_overview'] = '页面预览'; +$lang['admin_menu_new_page'] = '新建页面'; +$lang['admin_menu_logout'] = '注销'; +$lang['admin_menu_act_page_actions'] = '当前页:'; +$lang['admin_menu_edit_page'] = '编辑'; +$lang['admin_menu_delete_page'] = '删除'; +$lang['admin_menu_delete_page_conf'] = '确定删除当前页面?'; + +// Comments: +$lang['comment_headline'] = '评论'; +$lang['pingback_headline'] = 'Pingbacks'; +$lang['comment_no_comments'] = '暂无评论.'; +$lang['comments_closed'] = '禁止评论.'; +$lang['comment_time'] = '[时间|%A, %B %d, %Y, %H:%M]'; +$lang['comments_pagination_info'] = '共 [total_comments] 条评论, [current_page]/[total_pages] 页 '; +$lang['comments_add_comment'] = '增加评论'; +$lang['comment_input_text'] = '增加评论:'; +$lang['comment_edit_text'] = '编辑评论:'; +$lang['comment_input_name'] = '名称'; +$lang['comment_input_email_hp'] = '电子邮件或你的主页'; +$lang['comment_input_submit'] = ' 确认 '; +$lang['comment_input_preview'] = '预览'; +$lang['comment_preview_hl'] = '预览:'; +$lang['error_not_accepted_word'] = '禁止词: [not_accepted_word]'; +$lang['error_not_accepted_words'] = '禁止词: [not_accepted_words]'; +$lang['comment_error_closed'] = '评论关闭!'; +$lang['comment_error_no_name'] = '未填写名称'; +$lang['comment_error_no_text'] = '未填写评论内容'; +$lang['comment_error_name_too_long'] = '名称太长了'; +$lang['comment_error_email_hp_too_long'] = '电子邮件或你的主页太长了'; +$lang['comment_error_email_hp_invalid'] = '电子邮件或你的主页无效'; +$lang['comment_error_text_too_long'] = 'The text is too long ([characters] charcters; maximum: [max_characters] characters)'; +$lang['comment_error_too_long_word'] = '词太长: [word]'; +$lang['comment_error_too_long_words'] = '词太长: [words]'; +$lang['comment_error_entry_exists'] = '存在相同评论'; +$lang['comment_error_repeated_post'] = '通过你的IP已发表过一篇评论 - 请稍等再提交!'; +$lang['comment_error_too_fast'] = '表单提交过快,请稍等再提交!'; +$lang['comment_delete_link'] = '删除'; +$lang['comment_delete_confirm'] = '确认删除这条评论?'; +$lang['comment_edit_link'] = '编辑'; +$lang['comment_note_email'] = '(选项)'; +$lang['comments_open'] = '开启评论'; +$lang['comments_close'] = '评论关闭'; +$lang['comment_notification_subject'] = '在[page]上的评论'; +$lang['comment_notification_message'] = "[name]\n\n[comment]\n\n[link]"; +$lang['pingback_notification_subject'] = 'Pingback to [page]'; +$lang['pingback_notification_message'] = "[title]\n[url]\n[link]"; + +// News: +$lang['news_time'] = '[时间|%A, %B %d, %Y, %H:%M]'; +$lang['no_news'] = '暂无新闻'; + +// Notes: +$lang['note_time'] = '[时间|%A, %B %d, %Y, %H:%M]'; +$lang['no_notes'] = '暂无摘要'; + +// Formmailer: +$lang['formmailer_label_email'] = '电子邮件:'; +$lang['formmailer_label_subject'] = '主题:'; +$lang['formmailer_label_message'] = '内容:'; +$lang['formmailer_button_send'] = '发送'; +$lang['formmail_error_email_invalid'] = '电子邮件无效或为空'; +$lang['formmail_error_no_message'] = '内容为空'; +$lang['formmail_error_text_too_long'] = '内容太长了'; +$lang['formmail_error_subj_too_long'] = '标题太长了'; +$lang['formmail_error_mailserver'] = '邮件投递期间发生错误,请稍后再试!'; +$lang['formmailer_mail_sent'] = '邮件已成功发送.'; +$lang['formmailer_no_subject'] = '没有主题'; + +// Gallery: +$lang['gallery_no_photo'] = '此相册没有图片'; + +// Photo: +$lang['photo_headline'] = '图片'; +$lang['previous_photo'] = '上一张'; +$lang['next_photo'] = '下一张'; +$lang['enlarge_photo'] = '很大'; +$lang['reduce_photo'] = '中'; +$lang['show_large_photo'] = '大'; +$lang['show_large_photo_title'] = '显示大图片'; +$lang['back_link'] = 'back'; +$lang['back_title'] = 'Back to "[page]"'; +$lang['photo_comment_link_title'] = '查看此图片的评论'; + +// Simple news: +$lang['simple_news_time'] = '[日期|%A, %B %e, %Y]'; +$lang['simple_news_edit_title'] = '标题:'; +$lang['simple_news_edit_teaser'] = 'Teaser:'; +$lang['simple_news_edit_text'] = '内容:'; +$lang['simple_news_edit_text_format'] = '自动格式化'; +$lang['simple_news_edit_linkname'] = '链接名称:'; +$lang['simple_news_default_linkname'] = '更多…'; +$lang['simple_news_edit_time'] = '日期/时间:'; +$lang['simple_news_edit_time_format'] = 'YYYY-MM-DD HH:MM:SS'; +$lang['simple_news_add_item'] = '增加内容'; +$lang['simple_news_edit_item'] = '编辑'; +$lang['simple_news_delete_confirm'] = '删除这条内容?'; +$lang['error_news_no_title'] = '没有标题输入'; +$lang['error_news_no_text'] = '没有内容输入'; +$lang['error_news_time_invalid'] = '无效的日期/时间格式'; +$lang['delete_news_title'] = '删除'; +$lang['delete_news_confirm_submit'] = '确认 - 删除'; + +// Search: +$lang['search_submit'] = '搜索'; +$lang['search_number_of_results'][0] = '页面未找到'; +$lang['search_number_of_results'][1] = '找到一页:'; +$lang['search_number_of_results'][2] = '已找到 [pages] 页:'; +$lang['search_pagination'] = '[total_results] 条结果, [current_page]/[total_pages]'; +$lang['search_photo'] = '图片'; +$lang['search_no_results'] = '页面未找到'; + +// Akismet: +$lang['akismet_error_api_key'] = 'Invalid akismet api key'; +$lang['akismet_error_connection'] = 'Server connection error - please try again later'; +$lang['akismet_spam_suspicion'] = 'Spam suspicion!'; +?> +