Browse Source

remove install and modify change addr

stanley-king 9 years ago
parent
commit
a1e1fe1f1d

+ 4 - 1
core/framework/function/core.php

@@ -435,7 +435,10 @@ function Model($model = null, $base_path = null)
 	static $_cache = array();
 	$cache_key = $model.'.'.$base_path;
 	if (!is_null($model) && isset($_cache[$cache_key])) {
-        return $_cache[$cache_key];
+		$ret = $_cache[$cache_key];
+		if(!$ret->has_cls()) {
+			return $_cache[$cache_key];
+		}
     }
 
 	$base_path = $base_path == null ? BASE_DATA_PATH : $base_path;

+ 6 - 0
core/framework/libraries/model.php

@@ -17,6 +17,7 @@ class Model
 	protected $db = null;
 	protected $fields = array();
 	protected $unoptions = true;	//是否清空参数项,默认清除
+    private $is_cls = false;
 
 	public function __construct($table = null)
     {
@@ -632,9 +633,14 @@ class Model
     public function cls(){
     	$this->options = array();
     	$this->table_name = '';
+        $this->is_cls = true;
     	return $this;
     }
 
+    public function has_cls() {
+        return $this->is_cls;
+    }
+
     public function checkActive($host = 'master') {
         $this->db->checkActive($host);
     }

File diff suppressed because it is too large
+ 0 - 223
install/css/install.css


+ 0 - 63
install/data/config.ini.php

@@ -1,63 +0,0 @@
-<?php
-// defined('InShopNC') or exit('Access Invalid!');
-
-$config = array();
-$config['base_site_url']        = '===url===';
-$config['shop_site_url'] 		= '===url===/shop';
-$config['cms_site_url'] 		= '===url===/cms';
-$config['microshop_site_url'] 	= '===url===/microshop';
-$config['circle_site_url'] 		= '===url===/circle';
-$config['admin_site_url'] 		= '===url===/admin';
-$config['mobile_site_url'] 		= '===url===/mobile';
-$config['wap_site_url'] 		= '===url===/wap';
-$config['chat_site_url'] 		= '===url===/chat';
-$config['node_site_url'] 		= 'http://===node_ip===:8090';
-$config['upload_site_url']		= '===url===/data/upload';
-$config['resource_site_url']	= '===url===/data/resource';
-$config['version'] 		= '201502020388';
-$config['setup_date'] 	= '===setup_date===';
-$config['gip'] 			= 0;
-$config['dbdriver'] 	= '===db_driver===';
-$config['tablepre']		= '===db_prefix===';
-$config['db']['1']['dbhost']       = '===db_host===';
-$config['db']['1']['dbport']       = '===db_port===';
-$config['db']['1']['dbuser']       = '===db_user===';
-$config['db']['1']['dbpwd']        = '===db_pwd===';
-$config['db']['1']['dbname']       = '===db_name===';
-$config['db']['1']['dbcharset']    = '===db_charset===';
-$config['db']['slave']                  = $config['db']['master'];
-$config['session_expire'] 	= 3600;
-$config['lang_type'] 		= 'zh_cn';
-$config['cookie_pre'] 		= '===cookie_pre===';
-$config['thumb']['cut_type'] = 'gd';
-$config['thumb']['impath'] = '';
-$config['cache']['type'] 			= 'file';
-
-$config['redis']['prefix']      	= 'nc_';
-$config['redis']['master']['port']     	= 6379;
-$config['redis']['master']['host']     	= '127.0.0.1';
-$config['redis']['master']['pconnect'] 	= 0;
-$config['redis']['slave']      	    = array();
-//$config['fullindexer']['open']      = false;
-//$config['fullindexer']['appname']   = '33hao';
-$config['debug'] 			= false;
-$config['default_store_id'] = '1';
-//如果开始伪静态,这里设置为true
-$config['url_model'] = false;
-//如果店铺开启二级域名绑定的,这里填写主域名如baidu.com
-$config['subdomain_suffix'] = '';
-//$config['session_type'] = 'redis';
-//$config['session_save_path'] = 'tcp://127.0.0.1:6379';
-$config['node_chat'] = true;
-//流量记录表数量,为1~10之间的数字,默认为3,数字设置完成后请不要轻易修改,否则可能造成流量统计功能数据错误
-$config['flowstat_tablenum'] = 3;
-$config['sms']['gwUrl'] = 'http://sdkhttp.eucp.b2m.cn/sdk/SDKService';
-$config['sms']['serialNumber'] = '';
-$config['sms']['password'] = '';
-$config['sms']['sessionKey'] = '';
-$config['queue']['open'] = false;
-$config['queue']['host'] = '127.0.0.1';
-$config['queue']['port'] = 6379;
-$config['cache_open'] = true;
-$config['delivery_site_url']    = '===url===/delivery';
-return $config;

File diff suppressed because it is too large
+ 0 - 19070
install/data/utf8.sql


File diff suppressed because it is too large
+ 0 - 6257
install/data/utf8_add.sql


File diff suppressed because it is too large
+ 0 - 367
install/data/utf8_circle.sql


+ 0 - 252
install/data/utf8_cms.sql

@@ -1,252 +0,0 @@
-
-CREATE TABLE `#__cms_article` (
-  `article_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '文章编号',
-  `article_title` varchar(50) NOT NULL COMMENT '文章标题',
-  `article_class_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '文章分类编号',
-  `article_origin` varchar(50) DEFAULT NULL COMMENT '文章来源',
-  `article_origin_address` varchar(255) DEFAULT NULL COMMENT '文章来源链接',
-  `article_author` varchar(50) NOT NULL COMMENT '文章作者',
-  `article_abstract` varchar(140) DEFAULT NULL COMMENT '文章摘要',
-  `article_content` text COMMENT '文章正文',
-  `article_image` varchar(255) DEFAULT NULL COMMENT '文章图片',
-  `article_keyword` varchar(255) DEFAULT NULL COMMENT '文章关键字',
-  `article_link` varchar(255) DEFAULT NULL COMMENT '相关文章',
-  `article_goods` text COMMENT '相关商品',
-  `article_start_time` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '文章有效期开始时间',
-  `article_end_time` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '文章有效期结束时间',
-  `article_publish_time` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '文章发布时间',
-  `article_click` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '文章点击量',
-  `article_sort` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '文章排序0-255',
-  `article_commend_flag` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '文章推荐标志0-未推荐,1-已推荐',
-  `article_comment_flag` tinyint(1) unsigned NOT NULL DEFAULT '1' COMMENT '文章是否允许评论1-允许,0-不允许',
-  `article_verify_admin` varchar(50) DEFAULT NULL COMMENT '文章审核管理员',
-  `article_verify_time` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '文章审核时间',
-  `article_state` tinyint(1) unsigned NOT NULL DEFAULT '1' COMMENT '1-草稿、2-待审核、3-已发布、4-回收站',
-  `article_publisher_name` varchar(50) NOT NULL COMMENT '发布者用户名 ',
-  `article_publisher_id` int(10) unsigned NOT NULL COMMENT '发布者编号',
-  `article_type` tinyint(1) unsigned NOT NULL COMMENT '文章类型1-管理员发布,2-用户投稿',
-  `article_attachment_path` varchar(50) NOT NULL COMMENT '文章附件路径',
-  `article_image_all` text COMMENT '文章全部图片',
-  `article_modify_time` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '文章修改时间',
-  `article_tag` varchar(255) DEFAULT NULL COMMENT '文章标签',
-  `article_comment_count` int(10) unsigned NOT NULL COMMENT '文章评论数',
-  `article_attitude_1` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '文章心情1',
-  `article_attitude_2` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '文章心情2',
-  `article_attitude_3` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '文章心情3',
-  `article_attitude_4` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '文章心情4',
-  `article_attitude_5` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '文章心情5',
-  `article_attitude_6` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '文章心情6',
-  `article_title_short` varchar(50) NOT NULL DEFAULT '' COMMENT '文章短标题',
-  `article_attitude_flag` tinyint(1) unsigned NOT NULL DEFAULT '1' COMMENT '文章态度开关1-允许,0-不允许',
-  `article_commend_image_flag` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '文章推荐标志(图文)',
-  `article_share_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '文章分享数',
-  `article_verify_reason` varchar(255) DEFAULT NULL COMMENT '审核失败原因',
-  PRIMARY KEY (`article_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='CMS文章表';
-
-CREATE TABLE `#__cms_article_attitude` (
-  `attitude_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '心情编号',
-  `attitude_article_id` int(10) unsigned NOT NULL COMMENT '文章编号',
-  `attitude_member_id` int(10) unsigned NOT NULL COMMENT '用户编号',
-  `attitude_time` int(10) unsigned NOT NULL COMMENT '发布心情时间',
-  PRIMARY KEY (`attitude_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='CMS文章心情表';
-
-CREATE TABLE `#__cms_article_class` (
-  `class_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '分类编号 ',
-  `class_name` varchar(50) NOT NULL COMMENT '分类名称',
-  `class_sort` tinyint(1) unsigned NOT NULL DEFAULT '255' COMMENT '排序',
-  PRIMARY KEY (`class_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='cms文章分类表';
-
-CREATE TABLE `#__cms_comment` (
-  `comment_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '评论编号',
-  `comment_type` tinyint(1) NOT NULL COMMENT '评论类型编号',
-  `comment_object_id` int(10) unsigned NOT NULL COMMENT '推荐商品编号',
-  `comment_message` varchar(2000) NOT NULL COMMENT '评论内容',
-  `comment_member_id` int(10) unsigned NOT NULL COMMENT '评论人编号',
-  `comment_time` int(10) unsigned NOT NULL COMMENT '评论时间',
-  `comment_quote` varchar(255) DEFAULT NULL COMMENT '评论引用',
-  `comment_up` int(10) unsigned NOT NULL COMMENT '顶数量',
-  PRIMARY KEY (`comment_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='CMS评论表';
-
-CREATE TABLE `#__cms_comment_up` (
-  `up_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '顶编号',
-  `comment_id` int(10) unsigned NOT NULL COMMENT '评论编号',
-  `up_member_id` int(10) unsigned NOT NULL COMMENT '用户编号',
-  `up_time` int(10) unsigned NOT NULL COMMENT '评论时间',
-  PRIMARY KEY (`up_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='CMS评论顶表';
-
-CREATE TABLE `#__cms_index_module` (
-  `module_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '模块编号',
-  `module_title` varchar(50) DEFAULT '' COMMENT '模块标题',
-  `module_name` varchar(50) NOT NULL COMMENT '模板名称',
-  `module_type` varchar(50) DEFAULT '' COMMENT '模块类型,index-固定内容、article1-文章模块1、article2-文章模块2、micro-微商城、adv-通栏广告',
-  `module_sort` tinyint(1) unsigned DEFAULT '255' COMMENT '排序',
-  `module_state` tinyint(1) unsigned DEFAULT '1' COMMENT '状态1-显示、0-不显示',
-  `module_content` text COMMENT '模块内容',
-  `module_style` varchar(50) NOT NULL DEFAULT 'style1' COMMENT '模块主题',
-  `module_view` tinyint(3) unsigned NOT NULL DEFAULT '1' COMMENT '后台列表显示样式 1-展开 2-折叠',
-  PRIMARY KEY (`module_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='CMS首页模块表';
-
-CREATE TABLE `#__cms_module` (
-  `module_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '模板模块编号',
-  `module_title` varchar(50) NOT NULL DEFAULT '' COMMENT '模板模块标题',
-  `module_name` varchar(50) NOT NULL DEFAULT '' COMMENT '模板名称',
-  `module_type` varchar(50) NOT NULL DEFAULT '' COMMENT '模板模块类型,index-固定内容、article1-文章模块1、article2-文章模块2、micro-微商城、adv-通栏广告',
-  `module_class` tinyint(3) unsigned NOT NULL DEFAULT '1' COMMENT '模板模块种类1-系统自带 2-用户自定义',
-  PRIMARY KEY (`module_id`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COMMENT='CMS模板模块表';
-
-CREATE TABLE `#__cms_module_assembly` (
-  `assembly_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '组件编号',
-  `assembly_title` varchar(50) NOT NULL COMMENT '组件标题',
-  `assembly_name` varchar(50) NOT NULL COMMENT '组件名称',
-  `assembly_explain` varchar(255) NOT NULL COMMENT '组件说明',
-  PRIMARY KEY (`assembly_id`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COMMENT='cms模块组件表';
-
-CREATE TABLE `#__cms_module_frame` (
-  `frame_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '框架编号',
-  `frame_title` varchar(50) NOT NULL COMMENT '框架标题',
-  `frame_name` varchar(50) NOT NULL COMMENT '框架名称',
-  `frame_explain` varchar(255) NOT NULL COMMENT '框架说明',
-  `frame_structure` varchar(255) NOT NULL COMMENT '框架结构',
-  PRIMARY KEY (`frame_id`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COMMENT='cms模块框架表';
-
-CREATE TABLE `#__cms_navigation` (
-  `navigation_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '导航编号',
-  `navigation_title` varchar(50) NOT NULL COMMENT '导航标题',
-  `navigation_link` varchar(255) NOT NULL COMMENT '导航链接',
-  `navigation_sort` tinyint(1) unsigned NOT NULL DEFAULT '255' COMMENT '排序',
-  `navigation_open_type` tinyint(1) unsigned NOT NULL DEFAULT '1' COMMENT '导航打开方式1-本页打开,2-新页打开',
-  PRIMARY KEY (`navigation_id`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COMMENT='CMS导航表';
-
-CREATE TABLE `#__cms_picture` (
-  `picture_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '画报编号',
-  `picture_title` varchar(50) NOT NULL COMMENT '画报标题',
-  `picture_class_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '画报分类编号',
-  `picture_author` varchar(50) NOT NULL COMMENT '画报作者',
-  `picture_abstract` varchar(140) DEFAULT NULL COMMENT '画报摘要',
-  `picture_image` varchar(255) DEFAULT NULL COMMENT '画报图片',
-  `picture_keyword` varchar(255) DEFAULT NULL COMMENT '画报关键字',
-  `picture_publish_time` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '画报发布时间',
-  `picture_click` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '画报点击量',
-  `picture_sort` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '画报排序0-255',
-  `picture_commend_flag` tinyint(1) unsigned NOT NULL DEFAULT '1' COMMENT '画报推荐标志1-未推荐,2-已推荐',
-  `picture_comment_flag` tinyint(1) unsigned NOT NULL DEFAULT '1' COMMENT '画报是否允许评论1-允许,2-不允许',
-  `picture_verify_admin` varchar(50) DEFAULT NULL COMMENT '画报审核管理员',
-  `picture_verify_time` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '画报审核时间',
-  `picture_state` tinyint(1) unsigned NOT NULL DEFAULT '1' COMMENT '1-草稿、2-待审核、3-已发布、4-回收站、5-已关闭',
-  `picture_publisher_name` varchar(50) NOT NULL COMMENT '发布人用户名',
-  `picture_publisher_id` int(10) unsigned NOT NULL COMMENT '发布人编号',
-  `picture_type` tinyint(1) unsigned NOT NULL COMMENT '画报类型1-管理员发布,2-用户投稿',
-  `picture_attachment_path` varchar(50) NOT NULL DEFAULT '',
-  `picture_modify_time` int(10) unsigned NOT NULL COMMENT '画报修改时间',
-  `picture_tag` varchar(255) DEFAULT NULL COMMENT '画报标签',
-  `picture_comment_count` int(10) unsigned NOT NULL COMMENT '画报评论数',
-  `picture_title_short` varchar(50) NOT NULL DEFAULT '' COMMENT '画报短标题',
-  `picture_image_count` tinyint(1) unsigned NOT NULL COMMENT '画报图片总数',
-  `picture_share_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '画报分享数',
-  `picture_verify_reason` varchar(255) DEFAULT NULL COMMENT '审核失败原因',
-  PRIMARY KEY (`picture_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='CMS画报表';
-
-CREATE TABLE `#__cms_picture_class` (
-  `class_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '分类编号 ',
-  `class_name` varchar(50) NOT NULL COMMENT '分类名称',
-  `class_sort` tinyint(1) unsigned NOT NULL DEFAULT '255' COMMENT '排序',
-  PRIMARY KEY (`class_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='cms画报分类表';
-
-CREATE TABLE `#__cms_picture_image` (
-  `image_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '图片编号',
-  `image_name` varchar(255) NOT NULL COMMENT '图片地址',
-  `image_abstract` varchar(200) DEFAULT NULL COMMENT '图片摘要',
-  `image_goods` text COMMENT '相关商品',
-  `image_store` varchar(255) DEFAULT NULL COMMENT '相关店铺',
-  `image_width` int(10) unsigned DEFAULT NULL COMMENT '图片宽度',
-  `image_height` int(10) unsigned DEFAULT NULL COMMENT '图片高度',
-  `image_picture_id` int(10) unsigned NOT NULL COMMENT '画报编号',
-  `image_path` varchar(50) DEFAULT NULL COMMENT '图片路径',
-  PRIMARY KEY (`image_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='CMS画报图片表';
-
-CREATE TABLE `#__cms_special` (
-  `special_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '专题编号',
-  `special_title` varchar(50) NOT NULL COMMENT '专题标题',
-  `special_margin_top` int(10) DEFAULT '0' COMMENT '正文距顶部距离',
-  `special_background` varchar(255) DEFAULT NULL COMMENT '专题背景',
-  `special_image` varchar(255) DEFAULT NULL COMMENT '专题封面图',
-  `special_image_all` text COMMENT '专题图片',
-  `special_content` text COMMENT '专题内容',
-  `special_modify_time` int(10) unsigned NOT NULL COMMENT '专题修改时间',
-  `special_publish_id` int(10) unsigned NOT NULL COMMENT '专题发布者编号',
-  `special_state` tinyint(1) unsigned NOT NULL COMMENT '专题状态1-草稿、2-已发布',
-  `special_background_color` varchar(10) NOT NULL DEFAULT '#FFFFFF' COMMENT '专题背景色',
-  `special_repeat` varchar(10) NOT NULL DEFAULT 'no-repeat' COMMENT '背景重复方式',
-  `special_type` tinyint(1) unsigned NOT NULL DEFAULT '1' COMMENT '专题类型(1-cms专题 2-商城专题)',
-  PRIMARY KEY (`special_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='CMS专题表';
-
-CREATE TABLE `#__cms_tag` (
-  `tag_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '标签编号',
-  `tag_name` varchar(50) NOT NULL COMMENT '标签名称',
-  `tag_sort` tinyint(1) unsigned NOT NULL COMMENT '标签排序',
-  `tag_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '标签使用计数',
-  PRIMARY KEY (`tag_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='CMS标签表';
-
-CREATE TABLE `#__cms_tag_relation` (
-  `relation_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '关系编号',
-  `relation_type` tinyint(1) unsigned NOT NULL COMMENT '关系类型1-文章,2-画报',
-  `relation_tag_id` int(10) unsigned NOT NULL COMMENT '标签编号',
-  `relation_object_id` int(10) unsigned NOT NULL COMMENT '对象编号',
-  PRIMARY KEY (`relation_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='CMS标签关系表';
-
-INSERT INTO `#__setting` (`name`, `value`) VALUES 
-('cms_attitude_flag', '1'),
-('cms_comment_flag', '1'),
-('cms_isuse', '1'),
-('cms_logo', ''),
-('cms_seo_description', '资讯,画报'),
-('cms_seo_keywords', '资讯,画报'),
-('cms_seo_title', '资讯频道'),
-('cms_submit_flag', '1'),
-('cms_submit_verify_flag', '1');
-
-INSERT INTO `#__cms_module` (`module_id`, `module_title`, `module_name`, `module_type`, `module_class`) VALUES (1, '综合模块', 'index', 'index', 1),
-(2, '微商城模块', 'micro', 'micro', 1),
-(3, '文章模块1', 'article1', 'article1', 1),
-(4, '文章模块2', 'article2', 'article2', 1),
-(5, '通栏广告模块', 'adv', 'adv', 1);
-
-INSERT INTO `#__cms_module_assembly` (`assembly_id`, `assembly_title`, `assembly_name`, `assembly_explain`) VALUES (1, '文章', 'article', '文章组件'),
-(2, '图片', 'picture', '图片组件'),
-(3, '商品', 'goods', '商品组件'),
-(4, '品牌', 'brand', '品牌组件'),
-(5, '图文', 'article_image', '图文'),
-(6, '店铺', 'store', '店铺'),
-(7, '会员', 'member', '会员'),
-(8, 'FLASH', 'flash', 'FLASH'),
-(9, '自定义', 'html', '自定义');
-
-INSERT INTO `#__cms_module_frame` (`frame_id`, `frame_title`, `frame_name`, `frame_explain`, `frame_structure`) VALUES (1, '右边栏三列结构', '2_2_1', '右边栏三列结构', '{"block1":{"type":"block","name":"w2"},"block2":{"type":"block","name":"w2"},"block3":{"type":"block","name":"w1"}}'),
-(2, '左边栏三列结构', '1_2_2', '左边栏三列结构', '{"block1":{"type":"block","name":"w1"},"block2":{"type":"block","name":"w2"},"block3":{"type":"block","name":"w2"}}'),
-(3, '左右宽边栏结构', '2_1_2', '左右宽边栏结构', '{"block1":{"type":"block","name":"w2"},"block2":{"type":"block","name":"w1"},"block3":{"type":"block","name":"w2"}}'),
-(4, '左边栏两列结构', '1_4', '左边栏两列结构', '{"block1":{"type":"block","name":"w1"},"block2":{"type":"block","name":"w4"}} '),
-(5, '右边栏两列结构', '4_1', '右边栏两列结构', '{"block1":{"type":"block","name":"w4"},"block2":{"type":"block","name":"w1"}} '),
-(6, '右边栏混合结构', '2x2_2_1', '右边栏混合结构', '{"block1":{"type":"content","name":"w2","child":{"block2":{"type":"block","name":"w22"},"block3":{"type":"block","name":"w22"}}},"block4":{"type":"block","name":"w2"},"block5":{"type":"block","name":"w1"}} '),
-(7, '左边栏混合结构', '1_2_2x2', '左边栏混合结构', '{"block1":{"type":"block","name":"w1"},"block2":{"type":"block","name":"w2"},"block3":{"type":"content","name":"w2","child":{"block4":{"type":"block","name":"w22"},"block5":{"type":"block","name":"w22"}}}}'),
-(8, '一体化结构', '1', '一体化结构', '{"block1":{"type":"block","name":"w5"}}');
-
-INSERT INTO `#__cms_navigation` (`navigation_id`, `navigation_title`, `navigation_link`, `navigation_sort`, `navigation_open_type`) VALUES (1, '商城', '', 255, 1),
-(2, '圈子', 'circle', 255, 1),
-(3, '微商城', 'microshop', 255, 1),
-(4, '品牌', 'index.php?act=brand', 255, 1);

+ 0 - 121
install/data/utf8_microshop.sql

@@ -1,121 +0,0 @@
-
-CREATE TABLE `#__micro_adv` (
-  `adv_id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '广告编号',
-  `adv_type` varchar(50) DEFAULT '' COMMENT '广告类型',
-  `adv_name` varchar(255) NOT NULL DEFAULT '' COMMENT '广告名称',
-  `adv_image` varchar(255) NOT NULL DEFAULT '' COMMENT '广告图片',
-  `adv_url` varchar(255) NOT NULL DEFAULT '' COMMENT '广告链接',
-  `adv_sort` tinyint(1) unsigned NOT NULL DEFAULT '255' COMMENT '广告排序',
-  PRIMARY KEY (`adv_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='微商城广告表';
-
-CREATE TABLE `#__micro_comment` (
-  `comment_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '评论编号',
-  `comment_type` tinyint(1) NOT NULL COMMENT '评论类型编号',
-  `comment_object_id` int(10) unsigned NOT NULL COMMENT '推荐商品编号',
-  `comment_message` varchar(255) NOT NULL COMMENT '评论内容',
-  `comment_member_id` int(10) unsigned NOT NULL COMMENT '评论人编号',
-  `comment_time` int(10) unsigned NOT NULL COMMENT '评论时间',
-  PRIMARY KEY (`comment_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='微商城商品评论表';
-
-CREATE TABLE `#__micro_goods` (
-  `commend_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '推荐编号',
-  `commend_member_id` int(10) unsigned NOT NULL COMMENT '推荐人用户编号',
-  `commend_goods_id` int(10) unsigned NOT NULL COMMENT '推荐商品编号',
-  `commend_goods_commonid` int(10) unsigned NOT NULL COMMENT '商品公共表id',
-  `commend_goods_store_id` int(10) unsigned NOT NULL COMMENT '推荐商品店铺编号',
-  `commend_goods_name` varchar(100) NOT NULL COMMENT '推荐商品名称',
-  `commend_goods_price` decimal(11,2) NOT NULL COMMENT '推荐商品价格',
-  `commend_goods_image` varchar(100) NOT NULL COMMENT '推荐商品图片',
-  `commend_message` varchar(1000) NOT NULL COMMENT '推荐信息',
-  `commend_time` int(10) unsigned NOT NULL COMMENT '推荐时间',
-  `class_id` int(10) unsigned NOT NULL,
-  `like_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '喜欢数',
-  `comment_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '评论数',
-  `click_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '点击数',
-  `microshop_commend` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT '首页推荐 0-否 1-推荐',
-  `microshop_sort` tinyint(3) unsigned NOT NULL DEFAULT '255' COMMENT '排序',
-  PRIMARY KEY (`commend_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='微商城推荐商品表随心看';
-
-CREATE TABLE `#__micro_goods_class` (
-  `class_id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '分类编号 ',
-  `class_name` varchar(50) NOT NULL COMMENT '分类名称',
-  `class_parent_id` int(11) unsigned NOT NULL COMMENT '父级分类编号',
-  `class_sort` tinyint(4) unsigned NOT NULL COMMENT '排序',
-  `class_keyword` varchar(500) NOT NULL DEFAULT '' COMMENT '分类关键字',
-  `class_image` varchar(100) NOT NULL DEFAULT '' COMMENT '分类图片',
-  `class_commend` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '推荐标志0-不推荐 1-推荐到首页',
-  `class_default` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '默认标志,0-非默认 1-默认',
-  PRIMARY KEY (`class_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='微商城商品随心看分类表';
-
-CREATE TABLE `#__micro_goods_relation` (
-  `relation_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '关系编号',
-  `class_id` int(10) unsigned NOT NULL COMMENT '微商城商品分类编号',
-  `shop_class_id` int(10) unsigned NOT NULL COMMENT '商城商品分类编号',
-  PRIMARY KEY (`relation_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='微商城商品分类和商城商品分类对应关系';
-
-CREATE TABLE `#__micro_like` (
-  `like_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '喜欢编号',
-  `like_type` tinyint(1) NOT NULL COMMENT '喜欢类型编号',
-  `like_object_id` int(10) unsigned NOT NULL COMMENT '喜欢对象编号',
-  `like_member_id` int(10) unsigned NOT NULL COMMENT '喜欢人编号',
-  `like_time` int(10) unsigned NOT NULL COMMENT '喜欢时间',
-  PRIMARY KEY (`like_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='微商城喜欢表';
-
-CREATE TABLE `#__micro_member_info` (
-  `member_id` int(11) unsigned NOT NULL COMMENT '用户编号',
-  `visit_count` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '个人中心访问计数',
-  `personal_count` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '已发布个人秀数量',
-  `goods_count` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '已发布随心看数量',
-  PRIMARY KEY (`member_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='微商城用户信息表';
-
-CREATE TABLE `#__micro_personal` (
-  `personal_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '推荐编号',
-  `commend_member_id` int(10) unsigned NOT NULL COMMENT '推荐人用户编号',
-  `commend_image` text NOT NULL COMMENT '推荐图片',
-  `commend_buy` text NOT NULL COMMENT '购买信息',
-  `commend_message` varchar(1000) NOT NULL COMMENT '推荐信息',
-  `commend_time` int(10) unsigned NOT NULL COMMENT '推荐时间',
-  `class_id` int(10) unsigned NOT NULL,
-  `like_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '喜欢数',
-  `comment_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '评论数',
-  `click_count` int(10) unsigned NOT NULL DEFAULT '0',
-  `microshop_commend` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT '首页推荐 0-否 1-推荐',
-  `microshop_sort` tinyint(3) unsigned NOT NULL DEFAULT '255' COMMENT '排序',
-  PRIMARY KEY (`personal_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='微商城个人秀表';
-
-CREATE TABLE `#__micro_personal_class` (
-  `class_id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '分类编号 ',
-  `class_name` varchar(50) NOT NULL COMMENT '分类名称',
-  `class_sort` tinyint(4) unsigned NOT NULL COMMENT '排序',
-  `class_image` varchar(100) NOT NULL DEFAULT '' COMMENT '分类图片',
-  PRIMARY KEY (`class_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='微商城个人秀分类表';
-
-CREATE TABLE `#__micro_store` (
-  `microshop_store_id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '店铺街店铺编号',
-  `shop_store_id` int(11) unsigned NOT NULL COMMENT '商城店铺编号',
-  `microshop_sort` tinyint(1) unsigned DEFAULT '255' COMMENT '排序',
-  `microshop_commend` tinyint(1) unsigned DEFAULT '1' COMMENT '推荐首页标志 1-正常 2-推荐',
-  `like_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '喜欢数',
-  `comment_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '评论数',
-  `click_count` int(10) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`microshop_store_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='微商城店铺街表';
-
-INSERT INTO `#__setting` (`name`, `value`) VALUES ('microshop_goods_default_class', '0'),
-('microshop_header_pic', ''),
-('microshop_isuse', '1'),
-('microshop_logo', ''),
-('microshop_personal_limit', '50'),
-('microshop_seo_description', '多用户商城,微商城,随心看,个人秀,店铺街'),
-('microshop_seo_keywords', '多用户商城,微商城,随心看,个人秀,店铺街,网上购物'),
-('microshop_store_banner', ''),
-('microshop_style', 'default');

BIN
install/images/install_bg.png


+ 0 - 259
install/include/function.php

@@ -1,259 +0,0 @@
-<?php
-/**
- * environmental check
- */
-function env_check(&$env_items) {
-	$env_items[] = array('name' => '操作系统', 'min' => '无限制', 'good' => 'linux', 'cur'=>PHP_OS, 'status' => 1);
-
-	$env_items[] = array('name' => 'PHP版本', 'min' => '5.3', 'good' => '5.4', 'cur' => PHP_VERSION, 'status'=>(PHP_VERSION < 5.3 ? 0:1));
-
-	$tmp = function_exists('gd_info') ? gd_info() : array();
-	preg_match("/[\d.]+/", $tmp['GD Version'],$match);
-	unset($tmp);
-	$env_items[] = array('name' => 'GD库', 'min' => '2.0', 'good' => '2.0', 'cur' => $match[0], 'status' => ($match[0] < 2 ? 0:1));
-
-	$env_items[] = array('name' => '附件上传', 'min' => '未限制', 'good' => '2M','cur' => ini_get('upload_max_filesize'), 'status' => 1);
-
-	$disk_place = function_exists('disk_free_space') ? floor(disk_free_space(ROOT_PATH) / (1024*1024)) : 0;
-	$env_items[] = array('name' => '磁盘空间', 'min' => '100M', 'good' => '>100M','cur' => empty($disk_place) ? '未知' : $disk_place.'M', 'status' => $disk_place < 100 ? 0:1);
-}
-/**
- * file check
- */
-function dirfile_check(&$dirfile_items) {
-	foreach($dirfile_items as $key => $item) {
-		$item_path = '/'.$item['path'];
-		if($item['type'] == 'dir') {
-			if(!dir_writeable(ROOT_PATH.$item_path)) {
-				if(is_dir(ROOT_PATH.$item_path)) {
-					$dirfile_items[$key]['status'] = 0;
-					$dirfile_items[$key]['current'] = '+r';
-				} else {
-					$dirfile_items[$key]['status'] = -1;
-					$dirfile_items[$key]['current'] = 'nodir';
-				}
-			} else {
-				$dirfile_items[$key]['status'] = 1;
-				$dirfile_items[$key]['current'] = '+r+w';
-			}
-		} else {
-			if(file_exists(ROOT_PATH.$item_path)) {
-				if(is_writable(ROOT_PATH.$item_path)) {
-					$dirfile_items[$key]['status'] = 1;
-					$dirfile_items[$key]['current'] = '+r+w';
-				} else {
-					$dirfile_items[$key]['status'] = 0;
-					$dirfile_items[$key]['current'] = '+r';
-				}
-			} else {
-				if ($fp = @fopen(ROOT_PATH.$item_path,'wb+')){
-					$dirfile_items[$key]['status'] = 1;
-					$dirfile_items[$key]['current'] = '+r+w';
-					@fclose($fp);
-					@unlink(ROOT_PATH.$item_path);
-				}else {
-					$dirfile_items[$key]['status'] = -1;
-					$dirfile_items[$key]['current'] = 'nofile';
-				}
-			}
-		}
-	}
-}
-/**
- * dir is writeable
- * @return number
- */
-function dir_writeable($dir) {
-	$writeable = 0;
-	if(!is_dir($dir)) {
-		@mkdir($dir, 0755);
-	}else {
-		@chmod($dir,0755);
-	}
-	if(is_dir($dir)) {
-		if($fp = @fopen("$dir/test.txt", 'w')) {
-			@fclose($fp);
-			@unlink("$dir/test.txt");
-			$writeable = 1;
-		} else {
-			$writeable = 0;
-		}
-	}
-	return $writeable;
-}
-/**
- * function is exist
- */
-function function_check(&$func_items) {
-	$func = array();
-	foreach($func_items as $key => $item) {
-		$func_items[$key]['status'] = function_exists($item['name']) ? 1 : 0;
-	}
-}
-
-function show_msg($msg){
-	global $html_title,$html_header,$html_footer;
-	include 'step_msg.php';
-	exit();
-}
-/**
- * database check
- */
-function check_db($db_host, $db_user, $db_pwd, $db_name, $db_prefix, $db_port) {
-	if(!function_exists('mysql_connect')) {
-		show_msg('undefined function : mysql_connect()');
-	}
-	if(!@mysql_connect($db_host.":".$db_port, $db_user, $db_pwd)) {
-		show_msg('database connect failed');
-	} else {
-		if($query = mysql_query("SHOW TABLES FROM $db_name")) {
-			while($row = mysql_fetch_row($query)) {
-				if(preg_match("/^$db_prefix/", $row[0])) {
-					return false;
-				}
-			}
-		}
-	}
-	return true;
-}
-//make rand
-function random($length, $numeric = 0) {
-	$seed = base_convert(md5(print_r($_SERVER, 1).microtime()), 16, $numeric ? 10 : 35);
-	$seed = $numeric ? (str_replace('0', '', $seed).'012340567890') : ($seed.'zZ'.strtoupper($seed));
-	$hash = '';
-	$max = strlen($seed) - 1;
-	for($i = 0; $i < $length; $i++) {
-		$hash .= $seed[mt_rand(0, $max)];
-	}
-	return $hash;
-}
-/**
- * drop table 
- */
-function droptable($table_name){
-	return "DROP TABLE IF EXISTS `". $table_name ."`;";
-}
-
-//database class
-class db {
-	var $querynum = 0;
-	var $link;
-	var $histories;
-	var $time;
-	var $tablepre;
-
-	function connect($dbhost, $dbuser, $dbpw, $dbname = '', $dbcharset, $pconnect = 0, $tablepre='', $time = 0) {
-		$this->time = $time;
-		$this->tablepre = $tablepre;
-		if($pconnect) {
-			if(!$this->link = mysql_pconnect($dbhost, $dbuser, $dbpw)) {
-				$this->halt('Can not connect to MySQL server');
-			}
-		} else {
-			if(!$this->link = mysql_connect($dbhost, $dbuser, $dbpw, 1)) {
-				$this->halt('Can not connect to MySQL server');
-			}
-		}
-
-		if($this->version() > '5.0') {
-			if($dbcharset) {
-				mysql_query("SET character_set_connection=".$dbcharset.", character_set_results=".$dbcharset.", character_set_client=binary", $this->link);
-			}
-
-			if($this->version() > '5.0.1') {
-				mysql_query("SET sql_mode=''", $this->link);
-			}
-		}
-
-		if($dbname) {
-			mysql_select_db($dbname, $this->link);
-		}
-
-	}
-
-	function fetch_array($query, $result_type = MYSQL_ASSOC) {
-		return mysql_fetch_array($query, $result_type);
-	}
-
-	function result_first($sql, &$data) {
-		$query = $this->query($sql);
-		$data = $this->result($query, 0);
-	}
-
-	function fetch_first($sql, &$arr) {
-		$query = $this->query($sql);
-		$arr = $this->fetch_array($query);
-	}
-
-	function fetch_all($sql, &$arr) {
-		$query = $this->query($sql);
-		while($data = $this->fetch_array($query)) {
-			$arr[] = $data;
-		}
-	}
-
-	function query($sql, $type = '', $cachetime = FALSE) {
-		$func = $type == 'UNBUFFERED' && @function_exists('mysql_unbuffered_query') ? 'mysql_unbuffered_query' : 'mysql_query';
-		if(!($query = $func($sql, $this->link)) && $type != 'SILENT') {
-			$this->halt('MySQL Query Error', $sql);
-		}
-		$this->querynum++;
-		$this->histories[] = $sql;
-		return $query;
-	}
-
-	function affected_rows() {
-		return mysql_affected_rows($this->link);
-	}
-
-	function error() {
-		return (($this->link) ? mysql_error($this->link) : mysql_error());
-	}
-
-	function errno() {
-		return intval(($this->link) ? mysql_errno($this->link) : mysql_errno());
-	}
-
-	function result($query, $row) {
-		$query = @mysql_result($query, $row);
-		return $query;
-	}
-
-	function num_rows($query) {
-		$query = mysql_num_rows($query);
-		return $query;
-	}
-
-	function num_fields($query) {
-		return mysql_num_fields($query);
-	}
-
-	function free_result($query) {
-		return mysql_free_result($query);
-	}
-
-	function insert_id() {
-		return ($id = mysql_insert_id($this->link)) >= 0 ? $id : $this->result($this->query("SELECT last_insert_id()"), 0);
-	}
-
-	function fetch_row($query) {
-		$query = mysql_fetch_row($query);
-		return $query;
-	}
-
-	function fetch_fields($query) {
-		return mysql_fetch_field($query);
-	}
-
-	function version() {
-		return mysql_get_server_info($this->link);
-	}
-
-	function close() {
-		return mysql_close($this->link);
-	}
-
-	function halt($message = '', $sql = '') {
-						echo mysql_error();echo "<br />";
-	}
-}

+ 0 - 44
install/include/var.php

@@ -1,44 +0,0 @@
-<?php
-$env_items = array();
-$dirfile_items = array(
-		array('type' => 'dir', 'path' => 'data/cache'),
-		array('type' => 'dir', 'path' => 'data/cache/adv'),
-		array('type' => 'dir', 'path' => 'data/cache/rec_position'),
-		array('type' => 'dir', 'path' => 'data/config'),
-		array('type' => 'dir', 'path' => 'data/log'),
-		array('type' => 'dir', 'path' => 'data/session'),
-		array('type' => 'dir', 'path' => 'data/resource/phpqrcode/temp'),
-		array('type' => 'dir', 'path' => 'data/upload'),
-		array('type' => 'dir', 'path' => 'data/upload/shop/activity'),
-		array('type' => 'dir', 'path' => 'data/upload/shop/adv'),
-		array('type' => 'dir', 'path' => 'data/upload/shop/article'),
-		array('type' => 'dir', 'path' => 'data/upload/shop/avatar'),
-		array('type' => 'dir', 'path' => 'data/upload/shop/brand'),
-		array('type' => 'dir', 'path' => 'data/upload/shop/common'),
-		array('type' => 'dir', 'path' => 'data/upload/shop/complain'),
-		array('type' => 'dir', 'path' => 'data/upload/shop/editor'),
-		array('type' => 'dir', 'path' => 'data/upload/shop/groupbuy'),
-		array('type' => 'dir', 'path' => 'data/upload/shop/inform'),
-		array('type' => 'dir', 'path' => 'data/upload/shop/login'),
-		array('type' => 'dir', 'path' => 'data/upload/shop/member'),
-		array('type' => 'dir', 'path' => 'data/upload/shop/membertag'),
-		array('type' => 'dir', 'path' => 'data/upload/shop/pointprod'),
-		array('type' => 'dir', 'path' => 'data/upload/shop/rec_position'),
-		array('type' => 'dir', 'path' => 'data/upload/shop/refund'),
-		array('type' => 'dir', 'path' => 'data/upload/shop/store'),
-		array('type' => 'dir', 'path' => 'data/upload/shop/voucher'),
-		array('type' => 'dir', 'path' => 'data/upload/shop/watermark'),
-		array('type' => 'dir', 'path' => 'data/upload/circle'),
-		array('type' => 'dir', 'path' => 'data/upload/cms'),
-		array('type' => 'dir', 'path' => 'data/upload/microshop'),
-		//array('type' => 'dir', 'path' => 'shop/install'),
-);
-
-$func_items = array(
-		array('name' => 'mysql_connect'),
-		array('name' => 'fsockopen'),
-		array('name' => 'gethostbyname'),
-		array('name' => 'file_get_contents'),
-		array('name' => 'mb_convert_encoding'),
-		array('name' => 'json_encode'),
-);

+ 0 - 335
install/index.php

@@ -1,335 +0,0 @@
-<?php
-/**
- *
- * 多用户商城 instller
- *
- *
- */
- error_reporting (0);
- 
-define('InShopNC',true);
-
-// 设置最大执行时间
-set_time_limit(0);
-
-error_reporting(E_ALL & ~E_NOTICE);
-define('ROOT_PATH', dirname(dirname(__FILE__)));
-
-define('DBCHARSET','UTF8');//编码 分为 UTF8 GBK
-input($_GET);input($_POST);
-if(function_exists('date_default_timezone_set')){
-    date_default_timezone_set('Asia/Shanghai');
-}
-function input(&$data){
-	foreach ((array)$data as $key => $value) {
-		if (is_string($value)) {
-			if (!get_magic_quotes_gpc()) {
-				$value = htmlentities($value, ENT_NOQUOTES);
-				$value = addslashes(trim($value));
-			}
-		}else{
-			$data[$key] = input($value);
-		}
-	}
-}
-
-//Detection identifies the file exists, if it exists, then stop the installation
-if (file_exists('lock') && $_GET['step'] != 5){
-	@header("Content-type: text/html; charset=UTF-8");
-	echo "系统已经安装过了,如果要重新安装,那么请删除install目录下的lock文件";
-	exit;
-}
-
-//define variable
-
-$html_title = '最新版SHOPNC官方安装程序';
-
-$html_header = <<<EOF
-<div class="header">
-  <div class="layout">
-    <div class="title">
-      <h5>最新版SHOPNC官方安装程序</h5>
-      <h2>系统安装向导</h2>
-    </div>
-    <div class="version">版本: 2015.7</div>
-  </div>
-</div>
-
-EOF;
-
-$html_footer = <<<EOF
-<div class="footer">
-  <h6><a href="http://www.abc.com" target="_blank"></a></h6>
-</div>
-EOF;
-
-
-require('./include/function.php');
-if (!in_array($_GET['step'],array(1,2,3,4,5))) $_GET['step'] = 0;
-
-switch ($_GET['step']) {
-	case 1:
-		require('./include/var.php');
-		env_check($env_items);
-		dirfile_check($dirfile_items);
-		function_check($func_items);
-	break;
-	case 3:
-		$install_error = '';
-		$install_recover = '';
-		$demo_data =  file_exists('./data/utf8_add.sql') ? true : false;
-		step3($install_error,$install_recover);
-		break;
-	case 4:
-		step4();
-		break;
-	case 5:
-		$sitepath = strtolower(substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], '/')));
-		$sitepath = str_replace('/shop/install',"",$sitepath);
-		$auto_site_url = strtolower('http://'.$_SERVER['HTTP_HOST'].$sitepath);
-		break;
-	default:
-	break;
-}
-
-function step3(&$install_error,&$install_recover){
-    global $html_title,$html_header,$html_footer;
-	if ($_POST['submitform'] != 'submit') return;
-	$db_host = $_POST['db_host'];
-	$db_port = $_POST['db_port'];
-	$db_user = $_POST['db_user'];
-	$db_pwd = $_POST['db_pwd'];
-	$db_name = $_POST['db_name'];
-	$db_prefix = $_POST['db_prefix'];
-	$admin = $_POST['admin'];
-	$password = $_POST['password'];
-	if (!$db_host || !$db_port || !$db_user || !$db_pwd || !$db_name || !$db_prefix || !$admin || !$password){
-		$install_error = '输入不完整,请检查';
-	}
-	if(strpos($db_prefix, '.') !== false) {
-		$install_error .= '数据表前缀为空,或者格式错误,请检查';
-	}
-
-	if(strlen($admin) > 15 || preg_match("/^$|^c:\\con\\con$| |[,\"\s\t\<\>&]|^游客|^Guest/is", $admin)) {
-		$install_error .= '非法用户名,用户名长度不应当超过 15 个英文字符,且不能包含特殊字符,一般是中文,字母或者数字';
-	}
-	if ($install_error != '') reutrn;
-	if(!@mysql_connect($db_host.":".$db_port, $db_user, $db_pwd)) {
-		$install_error = '数据库连接失败';return;
-	}
-
-	if(mysql_get_server_info() > '5.0') {
-		mysql_query("CREATE DATABASE IF NOT EXISTS `$db_name` DEFAULT CHARACTER SET ".DBCHARSET);
-	} else {
-		$install_error = '数据库必须为MySQL5.0版本以上';return;
-	}
-	if(mysql_errno()) {
-		$install_error = mysql_error();return ;
-	}
-	if($_POST['install_recover'] != 'yes' && ($query = mysql_query("SHOW TABLES FROM $db_name"))) {
-		while($row = mysql_fetch_row($query)) {
-			if(preg_match("/^$db_prefix/", $row[0])) {
-				$install_error = '数据表已存在,继续安装将会覆盖已有数据';
-				$install_recover = 'yes';
-				return;
-			}
-		}
-	}
-
-	require ('step_4.php');
-	$sitepath = strtolower(substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], '/')));
-	$sitepath = str_replace('/install',"",$sitepath);
-	$auto_site_url = strtolower('http://'.$_SERVER['HTTP_HOST'].$sitepath);	
-
-	write_config($auto_site_url);
-
-	//execute sql
-	$db = new db;
-	$db->connect($db_host.":".$db_port, $db_user, $db_pwd, $db_name, DBCHARSET);
-	if (strtoupper(DBCHARSET) == 'GBK'){
-		$_charset = 'gbk';
-	}else{
-		$_charset = 'utf8';
-	}
-
-	/*$sql = file_get_contents("data/{$_charset}.sql");
-	$sql .= "\r\n".file_get_contents("data/{$_charset}_cms.sql");
-	$sql .= "\r\n".file_get_contents("data/{$_charset}_circle.sql");
-	$sql .= "\r\n".file_get_contents("data/{$_charset}_microshop.sql");*/
-	$sql = file_get_contents("data/{$_charset}.sql");
-
-	/*if ($_POST['demo_data'] == '1'){
-		$sql .= file_get_contents("data/{$_charset}_add.sql");
-	}*/
-	
-    $sql = str_replace("\r\n", "\n", $sql);
-    runquery($sql,$db_prefix,$db);
-	showjsmessage('初始化数据 ... 成功 ');
-
-	/**
-	 * 转码
-	 */
-	if (strtoupper(DBCHARSET) == 'GBK'){
-		$sitename = iconv('UTF-8','GBK',$_POST['site_name']);
-		$username = iconv('UTF-8','GBK',$_POST['admin']);
-		$password = iconv('UTF-8','GBK',$_POST['password']);
-		$store_name = iconv('UTF-8', 'GBK', $_POST['store_name']);
-		$member_name = iconv('UTF-8', 'GBK', $_POST['member_name']);
-		$seller_name = iconv('UTF-8', 'GBK', $_POST['seller_name']);
-		$member_password = iconv('UTF-8', 'GBK', $_POST['member_password']);
-	}else{
-		$sitename = $_POST['site_name'];
-		$username = $_POST['admin'];
-		$password = $_POST['password'];
-		$store_name = $_POST['store_name'];
-		$member_name = $_POST['member_name'];
-		$seller_name = $_POST['seller_name'];
-		$member_password = $_POST['member_password'];
-	}
-	/**
-	 * 产生随机的md5_key,来替换系统默认的md5_key值
-	 */
-	$md5_key = md5(random(4).substr(md5($_SERVER['SERVER_ADDR'].$_SERVER['HTTP_USER_AGENT'].$db_host.$db_user.$db_pwd.$db_name.substr(time(), 0, 6)), 8, 6).random(10));
-	$db->query("UPDATE {$db_prefix}setting SET value='".$sitename."' WHERE name='site_name'");
-	$db->query("UPDATE {$db_prefix}setting SET value='".$md5_key."' WHERE name='md5_key'");
-	
-	
-	//更新管理员账号和密码
-	$password=md5($password);
-	$member_password=md5($member_password);
-	$db->query("UPDATE `{$db_prefix}admin` SET `admin_name` = '{$username}' ,`admin_password` = '{$password}' WHERE `admin_id`=1;");
-	//更新店铺
-	
-	$db->query("UPDATE `{$db_prefix}member` SET `member_name` = '{$member_name}' ,`member_passwd` = '{$member_password}' WHERE `member_id`=1;");
-	
-	$db->query("UPDATE `{$db_prefix}store` SET `store_name` = '{$store_name}' ,`member_name` = '{$member_name}',`seller_name` = '{$seller_name}' WHERE `store_id`=1;");
-	
-	$db->query("UPDATE `{$db_prefix}store_joinin` SET `member_name` = '{$member_name}' ,`seller_name` = '{$seller_name}',`store_name` = '{$store_name}' WHERE `member_id`=1;");
-	
-	$db->query("UPDATE `{$db_prefix}seller` SET `seller_name` = '{$seller_name}' WHERE `seller_id`=1;");
-	
-	//管理员帐号密码
-	/*$db->query("INSERT INTO {$db_prefix}admin (`admin_id`,`admin_name`,`admin_password`,`admin_login_time`,`admin_login_num`,`admin_is_super`) VALUES ('1','$username','". md5($password) ."', '".time()."' ,'0',1);");
-
-    // 创建店铺
-    $db->query("INSERT INTO {$db_prefix}member (`member_id`,`member_name`,`member_passwd`,`member_email`,`member_time`,`member_login_time`,`member_old_login_time`) VALUES ('1', '{$member_name}','". md5($member_password) ."', '', '". time() ."', '". time() ."', '". time() ."')");
-    $db->query("INSERT INTO {$db_prefix}member_common (`member_id`) VALUES ('1')");
-    $db->query("INSERT INTO {$db_prefix}store (`store_id`,`store_name`,`grade_id`,`member_id`,`member_name`,`seller_name`,`store_state`,`store_time`) VALUES ('1','{$store_name}','1','1','{$member_name}','{$seller_name}','1', '". time() ."')");
-    $db->query("INSERT INTO {$db_prefix}store_joinin (`member_id`,`member_name`,`seller_name`,`store_name`,`joinin_state`) VALUES ('1', '{$member_name}', '{$seller_name}', '{$store_name}', '40')");
-    $db->query("INSERT INTO {$db_prefix}seller (`seller_id`,`seller_name`,`member_id`,`seller_group_id`,`store_id`,`is_admin`) VALUES ('1', '{$seller_name}', '1', '0', '1', '1')");*/
-	
-
-
-    //$db->query("UPDATE `{$db_prefix}navigation` SET nav_url=CONCAT('{$auto_site_url}/',nav_url)");
-    //$db->query("UPDATE `{$db_prefix}cms_navigation` SET navigation_link=CONCAT('{$auto_site_url}/',navigation_link)");
-    if ($_POST['demo_data'] == '1'){
-        $db->query("UPDATE {$db_prefix}store SET `live_store_name`='小信',`live_store_address`='天津市南开区南门外大街2号大悦城购物中心北区4L-27',`live_store_tel`='022-87288577',`live_store_bus`='829路、832路、837路、855路、841路、860路 地铁2号线' WHERE `store_id`=1");
-        $db->query("UPDATE `{$db_prefix}goods` SET `store_name` = '{$store_name}'");
-        $db->query("UPDATE `{$db_prefix}goods_common` SET `store_name` = '{$store_name}'");
-        $db->query("UPDATE `{$db_prefix}groupbuy` SET `store_name` = '{$store_name}'");
-        $db->query("UPDATE `{$db_prefix}groupbuy_quota` SET `member_name` = '{$member_name}' ,`store_name` = '{$store_name}';");
-        $db->query("UPDATE `{$db_prefix}p_xianshi` SET `member_name` = '{$member_name}' ,`store_name` = '{$store_name}';");
-        $db->query("UPDATE `{$db_prefix}p_xianshi_quota` SET `member_name` = '{$member_name}' ,`store_name` = '{$store_name}';");
-    }
-	//新增一个标识文件,用来屏蔽重新安装
-	$fp = @fopen('lock','wb+');
-	@fclose($fp);
-	exit("<script type=\"text/javascript\">document.getElementById('install_process').innerHTML = '安装完成,下一步...';document.getElementById('install_process').href='index.php?step=5&sitename={$sitename}&username={$username}&password={$password}';</script>");
-	exit();
-}
-include ("step_{$_GET['step']}.php");
-
-//execute sql
-function runquery($sql, $db_prefix, $db) {
-// 	global $lang, $tablepre, $db;
-
-	if(!isset($sql) || empty($sql)) return;
-
-	$sql = str_replace("\r", "\n", str_replace('#__', $db_prefix, $sql));
-	$ret = array();
-	$num = 0;
-	foreach(explode(";\n", trim($sql)) as $query) {
-		$ret[$num] = '';
-		$queries = explode("\n", trim($query));
-		foreach($queries as $query) {
-			$ret[$num] .= (isset($query[0]) && $query[0] == '#') || (isset($query[1]) && isset($query[1]) && $query[0].$query[1] == '--') ? '' : $query;
-		}
-		$num++;
-	}
-	unset($sql);
-	foreach($ret as $query) {
-		$query = trim($query);
-		if($query) {
-			if(substr($query, 0, 12) == 'CREATE TABLE') {
-				$line = explode('`',$query);
-				$data_name = $line[1];
-				showjsmessage('数据表  '.$data_name.' ... 创建成功');
-				$db->query(droptable($data_name));
-				/**
-				 * 转码
-				 */
-				if (strtoupper(DBCHARSET) == 'GBK'){
-					$query = iconv('GBK','UTF-8',$query);
-				}
-				$db->query($query);
-				unset($line,$data_name);
-			} else {
-				$db->query($query);
-			}
-		}
-	}
-}
-//抛出JS信息
-function showjsmessage($message) {
-	echo '<script type="text/javascript">showmessage(\''.addslashes($message).' \');</script>'."\r\n";
-	flush();
-	ob_flush();
-}
-
-
-
-//写入config文件
-function write_config($url) {
-	extract($GLOBALS, EXTR_SKIP);
-	$config = 'data/config.ini.php';
-
-	$configfile = @file_get_contents($config);
-	$configfile = trim($configfile);
-	$configfile = substr($configfile, -2) == '?>' ? substr($configfile, 0, -2) : $configfile;
-
-	if (strtoupper(DBCHARSET) == 'GBK'){
-		$charset = 'GBK';
-	}else {
-		$charset = 'UTF-8';
-	}
-
-	$db_host = $_POST['db_host'];
-	$db_port = $_POST['db_port'];
-	$db_user = $_POST['db_user'];
-	$db_pwd = $_POST['db_pwd'];
-	$db_name = $_POST['db_name'];
-	$db_prefix = $_POST['db_prefix'];
-	$admin = $_POST['admin'];
-	$password = $_POST['password'];
-	$db_type = (extension_loaded('mysqli')) ? 'mysqli' : 'mysql';
-
-	$cookie_pre = strtoupper(substr(md5(random(6).substr($_SERVER['HTTP_USER_AGENT'].md5($_SERVER['SERVER_ADDR'].$db_host.$db_user.$db_pwd.$db_name.substr(time(), 0, 6)), 8, 6).random(5)),0,4)).'_';
-	$configfile = str_replace("===url===",			$url, $configfile);
-	$configfile = str_replace("===node_ip===",		$_SERVER["SERVER_ADDR"], $configfile);
-	$configfile = str_replace("===db_prefix===",	$db_prefix, $configfile);
-	$configfile = str_replace("===db_driver===",	$db_type, $configfile);
-	$configfile = str_replace("===db_charset===",	$charset, $configfile);
-	$configfile = str_replace("===db_host===",		$db_host, $configfile);
-	$configfile = str_replace("===db_user===",		$db_user, $configfile);
-	$configfile = str_replace("===db_pwd===",		$db_pwd, $configfile);
-	$configfile = str_replace("===db_name===",		$db_name, $configfile);
-	$configfile = str_replace("===db_port===",		$db_port, $configfile);
-	$configfile = str_replace("===setup_date===",	date("Y-m-d H:i:s",time()), $configfile);
-	$configfile = str_replace("===cookie_pre===",	$cookie_pre, $configfile);
-	@file_put_contents('../data/config/config.ini.php', $configfile);
-}
-
-
-
-
-?>

File diff suppressed because it is too large
+ 0 - 69
install/step_0.php


+ 0 - 99
install/step_1.php

@@ -1,99 +0,0 @@
-<!doctype html>
-<html>
-<head>
-<meta charset="utf-8">
-<title><?php echo $html_title;?></title>
-<link href="css/install.css" rel="stylesheet" type="text/css">
-<script type="text/javascript" src="../data/resource/js/jquery.js"></script>
-<script>
-$(document).ready(function(){
-	$('#next').on('click',function(){
-		if (typeof($('.no').html()) == 'undefined'){
-			$(this).attr('href','index.php?step=2');
-		}else{
-			alert($('.no').eq(0).parent().parent().find('td:first').html()+' 未通过检测!');
-			$(this).attr('href','###');			
-		}	
-	});
-});
-</script>
-</head>
-<body>
-<?php defined('InShopNC') or exit('Access Invalid!');?>
-<?php echo $html_header;?>
-<div class="main">
-  <div class="step-box" id="step1">
-    <div class="text-nav">
-      <h1>Step.1</h1>
-      <h2>开始安装</h2>
-      <h5>检测服务器环境及文件目录权限</h5>
-    </div>
-    <div class="procedure-nav">
-      <div class="schedule-ico"><span class="a"></span><span class="b"></span><span class="c"></span><span class="d"></span></div>
-      <div class="schedule-point-now"><span class="a"></span><span class="b"></span><span class="c"></span><span class="d"></span></div>
-      <div class="schedule-point-bg"><span class="a"></span><span class="b"></span><span class="c"></span><span class="d"></span></div>
-      <div class="schedule-line-now"><em></em></div>
-      <div class="schedule-line-bg"></div>
-      <div class="schedule-text"><span class="a">检查安装环境</span><span class="b">选择安装方式</span><span class="c">创建数据库</span><span class="d">安装</span></div>
-    </div>
-  </div>
-  <div class="content-box">
-    <table width="100%" border="0" cellspacing="2" cellpadding="0">
-      <caption>
-      环境检查
-      </caption>
-      <tr>
-        <th scope="col">项目</th>
-        <th width="25%" scope="col">程序所需</th>
-        <th width="25%" scope="col">最佳配置推荐</th>
-        <th width="25%" scope="col">当前服务器</th>
-      </tr>
-      <?php foreach($env_items as $v){?>
-      <tr>
-        <td scope="row"><?php echo $v['name'];?></td>
-        <td><?php echo $v['min'];?></td>
-        <td><?php echo $v['good'];?></td>
-        <td><span class="<?php echo $v['status'] ? 'yes' : 'no';?>"><i></i><?php echo $v['cur'];?></span></td>
-      </tr>
-      <?php }?>
-    </table>
-    <table width="100%" border="0" cellspacing="2" cellpadding="0">
-      <caption>
-      目录、文件权限检查
-      </caption>
-      <tr>
-        <th scope="col">目录文件</th>
-        <th width="25%" scope="col">所需状态</th>
-        <th width="25%" scope="col">当前状态</th>
-      </tr>
-      <?php foreach($dirfile_items as $k => $v){?>
-      <tr>
-        <td><?php echo $v['path'];?> </td>
-        <td><span>可写</span></td>
-        <td><span class="<?php echo $v['status'] == 1 ? 'yes' : 'no';?>"><i></i><?php echo $v['status'] == 1 ? '可写' : '不可写';?></span></td>
-      </tr>
-      <?php }?>
-    </table>
-    <table width="100%" border="0" cellspacing="2" cellpadding="0">
-      <caption>
-      函数检查
-      </caption>
-      <tr>
-        <th scope="col">目录文件</th>
-        <th width="25%" scope="col">所需状态</th>
-        <th width="25%" scope="col">当前状态</th>
-      </tr>
-      <?php foreach($func_items as $k =>$v){?>
-      <tr>
-        <td><?php echo $v['name'];?>()</td>
-        <td><span>支持</span></td>
-        <td><span class="<?php echo $v['status'] == 1 ? 'yes' : 'no';?>"><i></i><?php echo $v['status'] == 1 ? '支持' : '不支持';?></span></td>
-      </tr>
-      <?php }?>
-    </table>
-  </div>
-  <div class="btn-box"><a href="index.php" class="btn btn-primary">上一步</a><a href='###' id="next" class="btn btn-primary">下一步</a></div>
-</div>
-<?php ECHO $html_footer;?>
-</body>
-</html>

+ 0 - 97
install/step_2.php

@@ -1,97 +0,0 @@
-<!doctype html>
-<html>
-<head>
-<meta charset="utf-8">
-<title><?php echo $html_title;?></title>
-<link href="css/install.css" rel="stylesheet" type="text/css">
-<script src="../data/resource/js/jquery.js"></script>
-<script src="../data/resource/js/jquery.icheck.min.js"></script>
-<script>
-$(document).ready(function(){
-  $('input[type="radio"]').on('ifChecked', function(event){
-	if(this.id == 'radio-0'){
-			$('.select-module').show();
-		}else{
-			$('.select-module').hide();
-		}
-  }).iCheck({
-    checkboxClass: 'icheckbox_flat-green',
-    radioClass: 'iradio_flat-green'
-  });
-  $('input[type="checkbox"]').iCheck({
-    checkboxClass: 'icheckbox_flat-green',
-    radioClass: 'iradio_flat-green'
-  });
-	$('#next').click(function(){
-		if ($('#cms').attr('checked') && $('#shop').attr('checked')){
-			$('#install_form').submit();
-		}else{
-			alert('商城与CMS必须安装');
-		}
-	});
-});
-</script>
-</head>
-
-<body>
-<?php ECHO $html_header;?>
-<div class="main">
-  <div class="step-box" id="step2">
-    <div class="text-nav">
-      <h1>Step.2</h1>
-      <h2>选择安装方式</h2>
-      <h5>根据需要选择系统模块完全或手动安装</h5>
-    </div>
-    <div class="procedure-nav">
-      <div class="schedule-ico"><span class="a"></span><span class="b"></span><span class="c"></span><span class="d"></span></div>
-      <div class="schedule-point-now"><span class="a"></span><span class="b"></span><span class="c"></span><span class="d"></span></div>
-      <div class="schedule-point-bg"><span class="a"></span><span class="b"></span><span class="c"></span><span class="d"></span></div>
-      <div class="schedule-line-now"><em></em></div>
-      <div class="schedule-line-bg"></div>
-      <div class="schedule-text"><span class="a">检查安装环境</span><span class="b">选择安装方式</span><span class="c">创建数据库</span><span class="d">安装</span></div>
-    </div>
-  </div>
-  <form method="get" id="install_form" action="index.php">
-  <input type="hidden" value="3" name="step">
-    <div class="select-install">
-      <label>
-      <input type="radio" name="iCheck" value="full" id="radio-1" class="green-radio" checked >
-      <h4>完全安装 ShopNC【B2B2C】</h4>
-      <h5>电商系统</h5>
-      </label>
-    </div>
-    <div class="select-module" id="result">
-      <div class="arrow"></div>
-      <ul>
-        <li class="cms">
-          <input type="checkbox" name="cms" id="cms" value="1" checked="checked"  disabled="">
-          <div class="ico"></div>
-          <h4>商城</h4>
-          <p>ShopNC商城模块是一套功能完善的多用户商城系统,也是整套电商门户的核心程序...</p>
-        </li>
-        <li class="shop">
-          <input type="checkbox" name="shop" id="shop" value="1" checked="checked" disabled="">
-          <div class="ico"></div>
-          <h4>CMS</h4>
-          <p>ShopNC CMS模块拥有文章、画报、专题发布等功能,自定义编辑模板,可在文章内容中关联商品...</p>
-        </li>
-        <li class="circle">
-          <input type="checkbox" name="circle" value="1" checked="checked" disabled="">
-          <div class="ico"></div>
-          <h4>圈子</h4>
-          <p>ShopNC圈子模块是会员交流互动的理想环境,增强站点人气。主题帖中可与商品关联,特色鲜明...</p>
-        </li>
-        <li class="microshop">
-          <input type="checkbox" name="microshop" value="1" checked="checked" disabled="">
-          <div class="ico"></div>
-          <h4>微商城</h4>
-          <p>ShopNC微商城模块以新颖的形式展示会员已购商品、实物秀图,提高商品浏览量,促进商城经营...</p>
-        </li>
-      </ul>
-    </div>
-    <div class="btn-box"><a href="index.php?step=1" class="btn btn-primary">上一步</a><a id="next" href="javascript:void(0);" class="btn btn-primary">下一步</a></div>
-  </form>
-</div>
-<?php ECHO $html_footer;?>
-</body>
-</html>

+ 0 - 190
install/step_3.php

@@ -1,190 +0,0 @@
-<!doctype html>
-<html>
-<head>
-<meta charset="utf-8">
-<title><?php echo $html_title;?></title>
-<link href="css/install.css" rel="stylesheet" type="text/css">
-<script type="text/javascript" src="../data/resource/js/jquery.js"></script>
-<script type="text/javascript" src="../data/resource/js/jquery.validation.min.js"></script>
-<script type="text/javascript" src="../data/resource/js/jquery.icheck.min.js"></script>
-<script>
-$(document).ready(function(){
-	$('input[type="checkbox"]').iCheck({
-    checkboxClass: 'icheckbox_flat-green',
-    radioClass: 'iradio_flat-green'
-  });
-});
-
-$(function(){
-	jQuery.validator.addMethod("lettersonly", function(value, element) {
-		return this.optional(element) || /^[^:%,'\*\"\s\<\>\&]+$/i.test(value);
-	}, "不得含有特殊字符");
-	$("#install_form").validate({
-		errorElement: "font",
-    rules : {
-        db_host : {required : true},
-        db_name : {required : true},
-        db_user : {required : true},
-        db_port : {required : true,digits : true},
-       	site_name : {required : true},
-       	admin : {required : true,lettersonly : true},
-       	password : {required : true, minlength : 6},
-       	rpassword : {required : true,equalTo : '#password'},
-		agree : {required : true},
-		store_name : {required : true},
-		member_name : {required : true},
-		seller_name : {required : true},
-		member_password : {required : true},
-		rmember_password : {required : true, equalTo : '#member_password'}
-    }
-	});
-
-	jQuery.extend(jQuery.validator.messages, {
-	  required: "未输入",
-	  digits: "格式错误",
-	  lettersonly: "不得含有特殊字符",
-	  equalTo: "两次密码不一致",
-	  minlength: "密码至少6位"
-	});
-
-	$('#next').click(function(){
-		$('#install_form').submit();
-	});
-
-});
-</script>
-</head>
-<body>
-<?php echo $html_header;?>
-<div class="main">
-  <div class="step-box" id="step3">
-    <div class="text-nav">
-      <h1>Step.3</h1>
-      <h2>创建数据库</h2>
-      <h5>填写数据库及站点相关信息</h5>
-    </div>
-    <div class="procedure-nav">
-      <div class="schedule-ico"><span class="a"></span><span class="b"></span><span class="c"></span><span class="d"></span></div>
-      <div class="schedule-point-now"><span class="a"></span><span class="b"></span><span class="c"></span><span class="d"></span></div>
-      <div class="schedule-point-bg"><span class="a"></span><span class="b"></span><span class="c"></span><span class="d"></span></div>
-      <div class="schedule-line-now"><em></em></div>
-      <div class="schedule-line-bg"></div>
-      <div class="schedule-text"><span class="a">检查安装环境</span><span class="b">选择安装方式</span><span class="c">创建数据库</span><span class="d">安装</span></div>
-    </div>
-  </div>
-  <form action="" id="install_form" method="post">
-    <input type="hidden" value="submit" name="submitform">
-    <input type="hidden" value="<?php echo $install_recover;?>" name="install_recover">
-    <div class="form-box control-group">
-      <fieldset>
-        <legend>数据库信息</legend>
-        <div>
-          <label>数据库服务器</label>
-          <span>
-          <input type="text" name="db_host" maxlength="60" value="<?php echo $_POST['db_host'] ? $_POST['db_host'] : 'localhost';?>">
-          </span> <em>数据库服务器地址,一般为localhost</em></div>
-        <div>
-          <label>数据库名</label>
-          <span>
-          <input type="text" name="db_name" maxlength="50" value="<?php echo $_POST['db_name'] ? $_POST['db_name'] : '33hao';?>">
-          </span> <em></em></div>
-        <div>
-          <label>数据库用户名</label>
-          <span>
-          <input type="text" name="db_user" maxlength="30" value="<?php echo $_POST['db_user'] ? $_POST['db_user'] : '';?>">
-          </span> <em></em></div>
-        <div>
-          <label>数据库密码</label>
-          <span>
-          <input type="password" name="db_pwd" maxlength="30" value="<?php echo $_POST['db_pwd'] ? $_POST['db_pwd'] : '';?>">
-          </span> <em></em></div>
-        <div>
-          <label>数据库表前缀</label>
-          <span>
-          <input type="text" name="db_prefix" maxlength="30" value="<?php echo $_POST['db_prefix'] ? $_POST['db_prefix'] : '33hao_';?>">
-          </span> <em>同一数据库运行多个多用户商城程序时,请修改前缀</em></div>
-        <div>
-          <label>数据库端口</label>
-          <span>
-          <input type="text" name="db_port" maxlength="30" value="<?php echo $_POST['db_port'] ? $_POST['db_port'] : '3306';?>">
-          </span> <em>数据库默认端口一般为3306</em></div>
-        <?php if ($demo_data) {?>
-        <div>
-          <label>&nbsp;</label>
-          <input name="demo_data" type="checkbox" id="demo_data" value="1" checked <?php echo ((empty($_POST['db_user']) || $_POST['demo_data']==1) ? 'checked':'');?>>
-        <h4>演示数据,建议默认安装</h4></div>
-        <?php }?>
-        <?php if ($install_error != ''){?>
-        <div>
-          <label></label>
-          <font class="error"><?php echo $install_error;?></font></div>
-        <?php }?>
-      </fieldset>
-      <fieldset>
-        <legend>网站信息</legend>
-        <div>
-          <label>站点名称</label>
-          <span>
-          <input name="site_name" value="<?php echo $_POST['site_name'];?>" maxlength="100" type="text">
-          </span> <em>输入站点名称,安装后可在平台设置中进行修改</em></div>
-        <div>
-          <label>管理员帐号</label>
-          <span>
-          <input name="admin" value="<?php echo $_POST['admin'];?>" maxlength="20" type="text">
-          </span> <em></em></div>
-        <div>
-          <label>管理员密码</label>
-          <span>
-          <input name="password" id="password" maxlength="20" value="<?php echo $_POST['password'];?>" type="password">
-          </span> <em>管理员密码不少于6个字符</em></div>
-        <div>
-          <label>重复密码</label>
-          <span>
-          <input name="rpassword" value="<?php echo $_POST['rpassword'];?>" maxlength="20" type="password">
-          </span> <em>确保两次输入的密码一致</em></div>
-      </fieldset>
-      <fieldset>
-        <legend>官方店铺信息</legend>
-        <div>
-          <label>店铺名称</label>
-          <span>
-            <input name="store_name" value="<?php echo $_POST['store_name'];?>" maxlength="50" type="text">
-          </span>
-          <em>官方店铺的店铺名称</em>
-        </div>
-        <div>
-          <label>会员用户名</label>
-          <span>
-            <input name="member_name" value="<?php echo $_POST['member_name']?>" maxlength="50" type="text">
-          </span>
-          <em>在买家入口登录的用户名</em>
-        </div>
-        <div>
-          <label>商家用户名</label>
-          <span>
-            <input name="seller_name" value="<?php echo $_POST['seller_name']?>" maxlength="50" type="text">
-          </span>
-          <em>在商家入口登录的用户名</em>
-        </div>
-        <div>
-          <label>登录密码</label>
-          <span>
-            <input name="member_password" id="member_password" value="<?php echo $_POST['member_password'];?>" maxlength="20" type="password">
-          </span>
-          <em>在买家和商家入口登录的密码,两个用户名使用同一个密码</em>
-        </div>
-        <div>
-          <label>重复密码</label>
-          <span>
-            <input name="rmember_password" value="<?php echo $_POST['rmember_password']?>" maxlength="20" type="password">
-          </span>
-          <em></em>
-        </div>
-      </fieldset>
-    </div>
-    <div class="btn-box"><a href="index.php?step=2" class="btn btn-primary">上一步</a><a id="next" href="javascript:void(0);" class="btn btn-primary">下一步</a></div>
-  </form>
-</div>
-<?php echo $html_footer;?>
-</body>
-</html>

+ 0 - 50
install/step_4.php

@@ -1,50 +0,0 @@
-<!doctype html>
-<html>
-<head>
-<meta charset="utf-8">
-<title><?php echo $html_title;?></title>
-<link href="css/install.css" rel="stylesheet" type="text/css">
-<script type="text/javascript" src="../data/resource/js/jquery.js"></script>
-<link href="../data/resource/js/perfect-scrollbar.min.css" rel="stylesheet" type="text/css">
-<script type="text/javascript" src="../data/resource/js/perfect-scrollbar.min.js"></script>
-<script type="text/javascript" src="../data/resource/js/jquery.mousewheel.js"></script>
-<script type="text/javascript">
-var scroll_height = 0;
-function showmessage(message) {
-	document.getElementById('license').innerHTML += message+"<br/>";
-	document.getElementById("text-box").scrollTop = 500+scroll_height;
-	scroll_height += 40;
-}
-$(document).ready(function(){
-	//自定义滚定条
-	$('#text-box').perfectScrollbar();
-});
-</script>
-</head>
-
-<body>
-<?php echo $html_header;?>
-<div class="main">
-  <div class="step-box" id="step4">
-    <div class="text-nav">
-      <h1>Step.4</h1>
-      <h2>安装数据库</h2>
-      <h5>正在执行数据库安装</h5>
-    </div>
-    <div class="procedure-nav">
-      <div class="schedule-ico"><span class="a"></span><span class="b"></span><span class="c"></span><span class="d"></span></div>
-      <div class="schedule-point-now"><span class="a"></span><span class="b"></span><span class="c"></span><span class="d"></span></div>
-      <div class="schedule-point-bg"><span class="a"></span><span class="b"></span><span class="c"></span><span class="d"></span></div>
-      <div class="schedule-line-now"><em></em></div>
-      <div class="schedule-line-bg"></div>
-      <div class="schedule-text"><span class="a">检查安装环境</span><span class="b">选择安装方式</span><span class="c">创建数据库</span><span class="d">安装</span></div>
-    </div>
-  </div>
-  <div class="text-box" id="text-box">
-    <div class="license" id="license"></div>
-  </div>
-  <div class="btn-box"><a href="javascript:void(0);" id="install_process" class="btn btn-primary">正在安装 ...</a></div>
-</div>
-<?php echo $html_footer;?>
-</body>
-</html>

+ 0 - 65
install/step_5.php

@@ -1,65 +0,0 @@
-<!doctype html>
-<html>
-<head>
-<meta charset="utf-8">
-<title><?php echo $html_title;?></title>
-<link href="css/install.css" rel="stylesheet" type="text/css">
-<script type="text/javascript" src="../data/resource/js/jquery.js"></script>
-<link href="../data/resource/js/perfect-scrollbar.min.css" rel="stylesheet" type="text/css">
-<script type="text/javascript" src="../data/resource/js/perfect-scrollbar.min.js"></script>
-<script type="text/javascript" src="../data/resource/js/jquery.mousewheel.js"></script>
-</head>
-
-<body>
-<?php echo $html_header;?>
-<div class="main">
-  <div class="final-succeed"> <span class="ico"></span>
-    <h2>程序已成功安装</h2>
-    <h5>选择您要进入的页面</h5>
-  </div>
-  <div class="final-site-nav">
-    <div class="arrow"></div>
-    <ul>
-      <li class="shop">
-        <div class="ico"></div>
-        <h5><a href="<?php echo substr($auto_site_url,0,-8);?>/shop" target="_blank">商城</a></h5>
-        <h6>线上购物、开店、交易...</h6>
-      </li>
-      <li class="cms">
-        <div class="ico"></div>
-        <h5><a href="<?php echo substr($auto_site_url,0,-8);?>/cms" target="_blank">资讯</a></h5>
-        <h6>CMS资讯、画报、专题...</h6>
-      </li>
-      <li class="circle">
-        <div class="ico"></div>
-        <h5><a href="<?php echo substr($auto_site_url,0,-8);?>/circle" target="_blank">圈子</a></h5>
-        <h6>主题、圈友、商品...</h6>
-      </li>
-      <li class="microshop">
-        <div class="ico"></div>
-        <h5><a href="<?php echo substr($auto_site_url,0,-8);?>/microshop" target="_blank">微商城</a></h5>
-        <h6>随心看、个人秀、店铺街</h6>
-      </li>
-      <li class="admin">
-        <div class="ico"></div>
-        <h5><a href="<?php echo substr($auto_site_url,0,-8);?>/admin" target="_blank">系统管理</a></h5>
-        <h6>电商系统后台</h6>
-      </li>
-    </ul>
-  </div>
-  <div class="final-intro">
-    <p><strong>系统管理默认地址:&nbsp;</strong><a href="<?php echo substr($auto_site_url,0,-8);?>/admin" target="_blank"><?php echo substr($auto_site_url,0,-8);?>/admin</a></p>
-    <p><strong>网站首页默认地址:&nbsp;</strong><a href="<?php echo substr($auto_site_url,0,-8);?>" target="_blank"><?php echo substr($auto_site_url,0,-8);?></a></p>
-     <p><strong>商家中心默认地址:&nbsp;</strong><a href="<?php echo substr($auto_site_url,0,-8);?>/shop/index.php?act=seller_login&op=show_login" target="_blank"><?php echo substr($auto_site_url,0,-8);?>/shop/index.php?act=seller_login&op=show_login</a></p>
-        </p>
-  </div>
-</div>
-<?php echo $html_footer;?>
-<script type="text/javascript">
-$(document).ready(function(){
-	//自定义滚定条
-	$('#text-box').perfectScrollbar();
-});
-</script>
-</body>
-</html>

+ 0 - 290
install/v3-b11-update/index.php

@@ -1,290 +0,0 @@
-<?php
-/**
- *
- * 好商城V3 instller
- *
- *
- */
-// 设置最大执行时间
-set_time_limit(0);
-define('InShopNC',true);
-error_reporting(E_ERROR | E_WARNING | E_PARSE);
-@ini_set ('memory_limit', '512M');
-@set_magic_quotes_runtime(0);
-$config_file = '../../data/config/config.ini.php';
-$setting_file = '../../data/cache/setting.php';
-$config = require($config_file);
-$setting = require($setting_file);
-
-$site_url = $config['admin_site_url'];
-$version = $config['version'];
-$dbcharset = $config['db']['1']['dbcharset'];
-$dbserver = $config['db']['1']['dbhost'];
-$dbserver_port = $config['db']['1']['dbport'];
-$dbname = $config['db']['1']['dbname'];
-$db_pre = $config['tablepre'];
-$dbuser = $config['db']['1']['dbuser'];
-$dbpasswd = $config['db']['1']['dbpwd'];
-define('DBCHARSET',$dbcharset);
-define('SiteUrl',$site_url);
-
-$db = new dbstuff();
-$dbcharset = 'utf8';
-$dbserver = $dbserver.":".$dbserver_port;
-$db->connect($dbserver, $dbuser, $dbpasswd, $dbname, $dbcharset);
-$tablepre = $db_pre;
-$current = $_GET['act'];
-
-//新增表和字段
-function update_db() {
-	$sqlfile = 'utf8.sql';
-	global $tablepre, $db,$config;
-	$sql = file_get_contents($sqlfile);
-	$sql = str_replace("\r\n", "\n", $sql);
-	runquery($sql);
-	//$db->query('update '.$tablepre.'goods set is_own_shop = 1 where store_id = '.$config['default_store_id']);
-	//$db->query('update '.$tablepre.'goods_common set is_own_shop = 1 where store_id = '.$config['default_store_id']);
-	//$db->query('update '.$tablepre.'store set is_own_shop = 1 where store_id = '.$config['default_store_id']);
-	//$db->query('update '.$tablepre.'store set bind_all_gc = 1 where store_id = '.$config['default_store_id']);
-}
-
-//execute sql
-//执行sql
-function runquery($sql) {
-	global $tablepre, $db;
-
-	if(!isset($sql) || empty($sql)) return;
-
-	$sql = str_replace("\r", "\n", str_replace('33hao_', $tablepre, $sql));
-	$ret = array();
-	$num = 0;
-	foreach(explode(";\n", trim($sql)) as $query) {
-		$ret[$num] = '';
-		$queries = explode("\n", trim($query));
-		foreach($queries as $query) {
-			$ret[$num] .= (isset($query[0]) && $query[0] == '#') || (isset($query[1]) && isset($query[1]) && $query[0].$query[1] == '--') ? '' : $query;
-		}
-		$num++;
-	}
-	unset($sql);
-
-	foreach($ret as $key => $query) {
-		$query = trim($query);
-		if($query) {
-			if(substr($query, 0, 12) == 'CREATE TABLE') {
-				$line = explode('`',$query);
-				$data_name = $line[1];
-				showjsmessage('数据表'.' '.$data_name.' ... '.'建立成功',$key);
-				$db->query($query);
-			} elseif(substr($query, 0, 11) == 'ALTER TABLE') {
-				$db->query($query);
-			} else {
-				$db->query($query);
-			}
-		}
-	}
-}
-//JS信息
-function showjsmessage($message,$n=1) {
-	echo 'setTimeout("showmessage(\''.addslashes($message).' \')",'.($n*150).');';
-}
-?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>好商城V3插件/升级包</title>
-<meta http-equiv="X-UA-Compatible" content="IE=7" />
-<link href="install.css" rel="stylesheet" type="text/css">
-<meta content="ShopNC" name="Copyright" />
-</head>
-	<div class="header">
-      <div class="layout">
-        <div class="title">
-          <h5>好商城V3提供升级包</h5>
-          <h2>好商城V3-b11升级包</h2>
-        </div>
-        <div class="version">版本: 2015.06.23</div>
-      </div>
-	</div>
-	<table class="menu" align="center">
-			<tr class="menu_tr">
-				<td align="center" <?php if($current == '') echo 'class="current"'; ?>>安装说明</td>
-				<td align="center" <?php if($current == '1') echo 'class="current"'; ?>>新增表和字段</td>
-				<td align="center" <?php if($current == '3') echo 'class="current"'; ?>>安装完成</td>
-			</tr>
-	</table>
-				<div class="main">
-				<div class="text-box" id="text-box">
-				<?php if ($current == ''){ ?>
-				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;如果你的版本里未安装www.33hao.com模块!你只需简单一步就可以安装好好商城V3-B11升级包了哦!感谢你对好商城V3的支持!<span style="color: #FF0000;">如因安装造成您原有二次开发功能的错误或丢失,www.33hao.com不予承担任何责任及损失,请您慎重操作。
-				</span><br /><br />
-				建议在升级过程中暂时关闭网站。进行下面操作前请确认已经完成备份,程序将自动修改数据库,点击按钮开始执行。<br />
-				<br />
-				<span style="color: #FF0000;">重要说明:</span><br />
-			  <div>
-			  	1、&nbsp;&nbsp;其他文件直接按文件名存放替换就可以了<br />
-			  	2、&nbsp;&nbsp;本程序由www.33hao.com开发!转载请保留版权<br />
-			  	3、&nbsp;&nbsp;好商城v3官方论坛:http://www.33hao.com<br />
-
-			  	<br /><br />
-			  </div>
-				<div class="btnbox marginbot">
-					<form method="get" action="index.php">
-					<input type="hidden" name="act" value="1">
-					<input type="hidden" name="go" value="3">
-					<input type="submit" value="确认安装" style="padding: 2px">
-					</form>
-				</div>
-			  <?php } elseif($current == '1') { ?>
-			  <div class="btnbox"><textarea name="notice" class="shop-tex"  readonly="readonly" id="notice"></textarea></div>
-					<script type="text/javascript">
-					function showmessage(message) {
-						document.getElementById('notice').value += message + "\r\n";
-					}
-					<?php update_db();?>
-					</script>
-			  <?php } else {
-			    $config_contents = @file_get_contents($config_file);
-			  	?>
-			  安装完成,进入<a href="<?php echo SiteUrl;?>" target="_blank">系统后台</a>更新缓存后即可使用。<span style="color:red">升级完后,记得删除本文件夹。</span>
-			  <?php } ?>
-				</div>
-				</div>
-<div class="footer">
-  <h5><a href="http://www.33hao.com" target="_blank">好商城V3提供</a></h6>
-</div>
-<script type="text/javascript">
-<?php if ($_GET['go'] == '3'){ ?>
-	window.setTimeout("javascript:location.href='index.php?act=3'", 2900);
-<?php } ?>
-</script>
-</body>
-</html>
-<?php
-//---------------------数据库操作类
-class dbstuff {
-	var $querynum = 0;
-	var $link;
-	var $histories;
-	var $time;
-	var $tablepre;
-
-	function connect($dbhost, $dbuser, $dbpw, $dbname = '', $dbcharset, $pconnect = 0, $tablepre='', $time = 0) {
-		$this->time = $time;
-		$this->tablepre = $tablepre;
-		if($pconnect) {
-			if(!$this->link = mysql_pconnect($dbhost, $dbuser, $dbpw)) {
-				$this->halt('Can not connect to MySQL server');
-			}
-		} else {
-			if(!$this->link = mysql_connect($dbhost, $dbuser, $dbpw, 1)) {
-				$this->halt('Can not connect to MySQL server');
-			}
-		}
-
-		if($this->version() > '4.1') {
-			if($dbcharset) {
-				mysql_query("SET character_set_connection=".$dbcharset.", character_set_results=".$dbcharset.", character_set_client=binary", $this->link);
-			}
-
-			if($this->version() > '5.0.1') {
-				mysql_query("SET sql_mode=''", $this->link);
-			}
-		}
-
-		if($dbname) {
-			mysql_select_db($dbname, $this->link);
-		}
-
-	}
-
-	function fetch_array($query, $result_type = MYSQL_ASSOC) {
-		return mysql_fetch_array($query, $result_type);
-	}
-
-	function result_first($sql, &$data) {
-		$query = $this->query($sql);
-		$data = $this->result($query, 0);
-	}
-
-	function fetch_first($sql, &$arr) {
-		$query = $this->query($sql);
-		$arr = $this->fetch_array($query);
-	}
-
-	function fetch_all($sql, &$arr) {
-		$query = $this->query($sql);
-		while($data = $this->fetch_array($query)) {
-			$arr[] = $data;
-		}
-	}
-
-	function query($sql, $type = '', $cachetime = FALSE) {
-		$func = $type == 'UNBUFFERED' && @function_exists('mysql_unbuffered_query') ? 'mysql_unbuffered_query' : 'mysql_query';
-		if(!($query = $func($sql, $this->link)) && $type != 'SILENT') {
-			$this->halt('MySQL Query Error', $sql);
-		}
-		$this->querynum++;
-		$this->histories[] = $sql;
-		return $query;
-	}
-
-	function affected_rows() {
-		return mysql_affected_rows($this->link);
-	}
-
-	function error() {
-		return (($this->link) ? mysql_error($this->link) : mysql_error());
-	}
-
-	function errno() {
-		return intval(($this->link) ? mysql_errno($this->link) : mysql_errno());
-	}
-
-	function result($query, $row) {
-		$query = @mysql_result($query, $row);
-		return $query;
-	}
-
-	function num_rows($query) {
-		$query = mysql_num_rows($query);
-		return $query;
-	}
-
-	function num_fields($query) {
-		return mysql_num_fields($query);
-	}
-
-	function free_result($query) {
-		return mysql_free_result($query);
-	}
-
-	function insert_id() {
-		return ($id = mysql_insert_id($this->link)) >= 0 ? $id : $this->result($this->query("SELECT last_insert_id()"), 0);
-	}
-
-	function fetch_row($query) {
-		$query = mysql_fetch_row($query);
-		return $query;
-	}
-
-	function fetch_fields($query) {
-		return mysql_fetch_field($query);
-	}
-
-	function version() {
-		return mysql_get_server_info($this->link);
-	}
-
-	function close() {
-		return mysql_close($this->link);
-	}
-
-	function halt($message = '', $sql = '') {
-		//		echo mysql_error();echo "<br />";
-	}
-}
-//----------------------数据库操作类 end
-?>

+ 0 - 66
install/v3-b11-update/install.css

@@ -1,66 +0,0 @@
-@charset "utf-8";
-/* ================================ */
-/* Installation  related styles	 	*/
-/* Author:			Hulihutu		*/
-/* Copyright:		www.shopwwi.com	*/
-/* Create Date:		Jun-04-2013		*/
-/* Retrofit Date:	Jun-15-2013		*/
-/* ================================ */
-
-* { word-wrap: break-word; outline: none;}
-html, body, ul, li, p { padding: 0; margin: 0;}
-
-body { font-family: "microsoft yahei", "Microsoft YaHei", "Lucida Grande", "Lucida Sans Unicode", Tahoma, Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; color: #7E8C8D; background-color: #FFFFFF;}
-h1, h2, h4, h5, h6 { font-weight: normal; margin: 0;}
-i, em { font-style: normal;}
-ul, ol, li { list-style-type: none;}
-a { color: #16A085; text-decoration: underline; transition: all 0.25s ease 0s;}
-html { -webkit-text-size-adjust: none; min-height: 101%;}
-
-
-/* Button Style
--------------------------------------- */
-.btn { font-size: 18px; line-height: 20px; color: #FFFFFF; background: #BDC3C7; display: inline-block; height: 20px; padding: 15px 30px; margin: 0 5px; border: none; text-decoration: none; text-shadow: none; -webkit-border-radius: 4px; -moz-border-radius: 4px/; border-radius: 4px; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; -webkit-transition: 0.25s; -moz-transition: 0.25s; -o-transition: 0.25s; transition: 0.25s; -webkit-backface-visibility: hidden;}
-.btn:hover, .btn:focus { color: #FFFFFF; background-color: #CACFD2; outline: none; -webkit-transition: 0.25s; -moz-transition: 0.25s; -o-transition: 0.25s; transition: 0.25s; -webkit-backface-visibility: hidden;}
-.btn:active, .btn.active { color: rgba(255, 255, 255, 0.75); background-color: #A1A6A9; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none;}
-.btn.disabled, .btn[disabled] { color: rgba(255, 255, 255, 0.75); background-color: #BDC3C7; opacity: 0.7; filter: alpha(opacity=70)/*IE*/; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none;}
-.btn.btn-primary { background-color: #1ABC9C;}
-.btn.btn-primary:hover, .btn.btn-primary:focus { background-color: #48C9B0;}
-
-/* Layout head
--------------------------------------- */
-.header { width: 100%; height: 100px; border-bottom: solid 1px #ECF0F1;}
-.header .layout { width: 960px; height: 100px; margin: 0 auto; position: relative; z-index: 1;}
-.header .layout .title { height: 60px; position: absolute; z-index: 1; top: 20px; left: 0;}
-.header .layout .title h2 { font-size: 36px; line-height: 40px; color: #159F85; display: block; height: 40px;}
-.header .layout .title h5 { font-size: 13px; font-weight: 600; line-height: 20px; color: #2C3E50; text-align: center; display: block; height: 20px;}
-.header .layout .title h5 i { font-size: 11px; font-weight: normal; display: inline-block; margin: 0 0 0 5px;}
-.header .layout .version { color: #7E8C8D; position: absolute; z-index: 1; bottom: 20px; right: 0;}
-
-/* Layout Central
--------------------------------------- */
-.main { width: 100%; padding: 30px 0;}
-
-.menu { width: 898px;}
-.menu_tr td { border-bottom: 3px solid #EEEEEE; color: #999999; height: 30px; line-height: 30px;}
-.current { border-bottom-color: #FF9900 !important; color: #009900 !important; font-weight: bold;}
-/* Layout Bottom - copyright information
--------------------------------------- */
-.footer { text-align: center; width: 100%; height: 60px; padding: 10px 0 20px 0; border-top: solid 1px #ECF0F1;}
-.footer h5 { font-family: Tahoma, Helvetica, Arial, sans-serif; font-size: 12px; font-weight: 600; line-height: 24px; color: #7E8C8C;}
-.footer h5 .blue { color: #2B81BA;}
-.footer h5 .orange { color: #E77E23;}
-.footer h5 .black { color: #2D3E50;}
-.footer h5 sup { color: #34495E; margin-left: 2px;}
-.footer h6 { font-family: Tahoma, Helvetica, Arial, sans-serif; font-size: 11px; line-height: 16px; color: #92A5A5;}
-.footer h6 a { text-decoration: none; color: #7E8C8C;}
-.footer h6 a:hover { text-decoration: blink;}
-
-/* Content section
--------------------------------------- */
-.text-box { width: 898px; margin: 0 auto; border: solid 1px #ECF0F1; position: relative; z-index: 1; overflow: hidden;}
-
-
-.btnbox{ text-align:center; }
-	.btnbox input{ margin:0 2px; }
-	.btnbox textarea{ margin-bottom:10px; width: 90%; height:150px; }

+ 0 - 8
install/v3-b11-update/utf8.sql

@@ -1,8 +0,0 @@
-INSERT INTO `33hao_setting` VALUES ('mobile_host_type', '');
-INSERT INTO `33hao_setting` VALUES ('mobile_host', '');
-INSERT INTO `33hao_setting` VALUES ('mobile_username', '');
-INSERT INTO `33hao_setting` VALUES ('mobile_pwd', '');
-INSERT INTO `33hao_setting` VALUES ('mobile_signature', '');
-INSERT INTO `33hao_setting` VALUES ('mobile_key', '');
-INSERT INTO `33hao_setting` VALUES ('mobile_memo', '');
-ALTER TABLE `33hao_store` ADD `store_free_time` varchar(10) DEFAULT NULL DEFAULT '2' COMMENT 'É̼ÒÅäËÍʱ¼ä';

+ 5 - 2
mobile/control/member_cart.php

@@ -64,8 +64,11 @@ class member_cartControl extends mbMemberControl
             $goods_spec = unserialize($goods_promotion['goods_spec']);
             $goods_spec_array = array();
 
-            foreach ($goods_spec as $val) {
-                array_push($goods_spec_array, $val);
+            if(!empty($goods_spec))
+            {
+                foreach ($goods_spec as $val) {
+                    array_push($goods_spec_array, $val);
+                }
             }
 
             $cart_list[$key]['goods_storage'] = $goods_storage;

+ 0 - 1
start-fcgi.sh

@@ -1,3 +1,2 @@
 #! /bin/sh
-cd /opt/shopnc/
 spawn-fcgi -a 127.0.0.1 -p 9100 -F 1 -f "/usr/local/bin/php fcgi_run.php"