diff --git a/admin/admin_logs.php b/admin/admin_logs.php
index adc874f..3942dd7 100755
--- a/admin/admin_logs.php
+++ b/admin/admin_logs.php
@@ -1,18 +1,5 @@
dump_sql .= '-- END ecshop v2.x SQL Dump Program ';
+ $this->dump_sql .= '-- END SQL Dump Program ';
$this->put_tables_list($path, $tables);
return $tables;
@@ -330,13 +318,12 @@ class cls_sql_dump
$sys_info['mysql_ver'] = $this->db->version();
$sys_info['date'] = date('Y-m-d H:i:s');
- $head = "-- ecshop v2.x SQL Dump Program\r\n".
+ $head = "-- SQL Dump Program\r\n".
"-- " . $sys_info['web_server'] . "\r\n".
"-- \r\n".
"-- DATE : ".$sys_info["date"]."\r\n".
"-- MYSQL SERVER VERSION : ".$sys_info['mysql_ver']."\r\n".
"-- PHP VERSION : ".$sys_info['php_ver']."\r\n".
- "-- ECShop VERSION : ".VERSION."\r\n".
"-- Vol : " . $vol . "\r\n";
return $head;
diff --git a/admin/includes/init.php b/admin/includes/init.php
index 02b7396..b98e152 100755
--- a/admin/includes/init.php
+++ b/admin/includes/init.php
@@ -40,7 +40,6 @@ else
include('../includes/config.php');
}
-/* 取得当前ecshop所在的根目录 */
if(!defined('ADMIN_PATH'))
{
define('ADMIN_PATH','admin');
@@ -99,7 +98,6 @@ if (strpos(PHP_SELF, '.php/') !== false)
exit();
}
-/* 创建 ECSHOP 对象 */
$ecs = new ECS($db_name, $prefix);
define('DATA_DIR', $ecs->data_dir());
define('IMAGE_DIR', $ecs->image_dir());
diff --git a/admin/includes/lib_common.php b/admin/includes/lib_common.php
index bad7111..cafdc7e 100755
--- a/admin/includes/lib_common.php
+++ b/admin/includes/lib_common.php
@@ -540,7 +540,7 @@ function load_config()
if (empty($arr['integrate_code']))
{
- $arr['integrate_code'] = 'ecshop'; // 默认的会员整合插件为 ecshop
+ $arr['integrate_code'] = 'ecshop';
}
write_static_cache('shop_config', $arr);
}
diff --git a/admin/includes/lib_template.php b/admin/includes/lib_template.php
index e9cda11..8b13453 100755
--- a/admin/includes/lib_template.php
+++ b/admin/includes/lib_template.php
@@ -1,18 +1,5 @@
-ECSHOP Menu
+Menu
-->
diff --git a/admin/users.php b/admin/users.php
index a1a797a..7d1300e 100755
--- a/admin/users.php
+++ b/admin/users.php
@@ -200,8 +200,6 @@ elseif ($_REQUEST['act'] == 'update')
$db->query($sql);
}
- /* 代码增加2014-12-23 by www.68ecshop.com _star */
-
/* 更新会员的其它信息 */
$other = array();
$other['name'] = $_POST['name'];
diff --git a/back/includes/cls_exchange.php b/back/includes/cls_exchange.php
index d9ea7ef..57665e0 100755
--- a/back/includes/cls_exchange.php
+++ b/back/includes/cls_exchange.php
@@ -1,18 +1,5 @@
db->version();
$sys_info['date'] = date('Y-m-d H:i:s');
- $head = "-- ecshop v2.x SQL Dump Program\r\n".
+ $head = "-- SQL Dump Program\r\n".
"-- " . $sys_info['web_server'] . "\r\n".
"-- \r\n".
"-- DATE : ".$sys_info["date"]."\r\n".
"-- MYSQL SERVER VERSION : ".$sys_info['mysql_ver']."\r\n".
"-- PHP VERSION : ".$sys_info['php_ver']."\r\n".
- "-- ECShop VERSION : ".VERSION."\r\n".
"-- Vol : " . $vol . "\r\n";
return $head;
diff --git a/back/includes/init.php b/back/includes/init.php
index e00c230..56f0b40 100755
--- a/back/includes/init.php
+++ b/back/includes/init.php
@@ -102,7 +102,6 @@ if (strpos(PHP_SELF, '.php/') !== false)
exit();
}
-/* 创建 ECSHOP 对象 */
$ecs = new ECS($db_name, $prefix);
define('DATA_DIR', $ecs->data_dir());
define('IMAGE_DIR', $ecs->image_dir());
diff --git a/back/includes/lib_goods.php b/back/includes/lib_goods.php
index 89a33fe..c1d69ab 100755
--- a/back/includes/lib_goods.php
+++ b/back/includes/lib_goods.php
@@ -1,17 +1,5 @@
table('store_goods_stock') ." where goods_id='$goods_id'";
diff --git a/back/includes/lib_main_1.php b/back/includes/lib_main_1.php
index d0679c6..c887826 100755
--- a/back/includes/lib_main_1.php
+++ b/back/includes/lib_main_1.php
@@ -1,17 +1,5 @@
@@ -325,7 +312,6 @@ function create_html_editor($input_name, $input_value = '')
});
';
$smarty->assign('FCKeditor', $HTML);
- /* 修改 by www.68ecshop.com 百度编辑器 end */
}
diff --git a/back/includes/lib_template.php b/back/includes/lib_template.php
index 6f3d777..e22f0bc 100755
--- a/back/includes/lib_template.php
+++ b/back/includes/lib_template.php
@@ -1,17 +1,5 @@
-ECSHOP Menu
+Menu
-->
diff --git a/includes/cls_ecshop.php b/includes/cls_ecshop.php
index 5f2dc79..bd3f7fd 100755
--- a/includes/cls_ecshop.php
+++ b/includes/cls_ecshop.php
@@ -41,14 +41,6 @@ class ECS
return '`' . $this->db_name . '`.`' . $this->prefix . $str . '`';
}
- /**
- * ECSHOP 密码编译方法;
- *
- * @access public
- * @param string $pass 需要编译的原始密码
- *
- * @return string
- */
function compile_password($pass)
{
return md5($pass);
@@ -105,13 +97,6 @@ class ECS
return $protocol . $host;
}
- /**
- * 获得 ECSHOP 当前环境的 URL 地址
- *
- * @access public
- *
- * @return void
- */
function url()
{
$curr = strpos(PHP_SELF, ADMIN_PATH . '/') !== false ?
@@ -128,13 +113,6 @@ class ECS
return $this->get_domain() . $root;
}
- /**
- * 获得 ECSHOP 当前环境的 HTTP 协议方式
- *
- * @access public
- *
- * @return void
- */
function http()
{
if(isset($_SERVER['HTTP_X_FORWARDED_PROTO'])){
diff --git a/includes/cls_error.php b/includes/cls_error.php
index 5b064a0..a5f3fac 100755
--- a/includes/cls_error.php
+++ b/includes/cls_error.php
@@ -1,17 +1,5 @@
format_number($total_fee);//交易总额
- // ECSHOP没有部分支付,如果部分支付,将ecshop的未支付改成部分支付
if ($paramss['pay_status'] == 'PAY_NO' && $paramss['payed_fee']>0) {
$paramss['pay_status'] = 'PAY_PART';
}
diff --git a/includes/cls_rss.php b/includes/cls_rss.php
index 22dde00..8e4b228 100755
--- a/includes/cls_rss.php
+++ b/includes/cls_rss.php
@@ -1,18 +1,5 @@
title) . '.xml');
$this->output = '<' . '?xml version="1.0" encoding="' . $this->encoding . '"?' .'>' . "\n" .
- '' . "\n" . $this->output;
+ '' . "\n" . $this->output;
echo $this->output;
} // end function
diff --git a/includes/cls_session.php b/includes/cls_session.php
index 24caf23..a4a6bc2 100755
--- a/includes/cls_session.php
+++ b/includes/cls_session.php
@@ -258,7 +258,6 @@ class cls_session
setcookie($this->session_name, $this->session_id, 1, $this->session_cookie_path, $this->session_cookie_domain, $this->session_cookie_secure);
- /* ECSHOP 自定义执行部分 */
$this->db->query('DELETE FROM ' . $this->session_data_table . " WHERE sesskey = '" . $this->session_id . "' LIMIT 1");
diff --git a/includes/cls_sms.php b/includes/cls_sms.php
index 5f35365..ba2dd40 100755
--- a/includes/cls_sms.php
+++ b/includes/cls_sms.php
@@ -1,18 +1,5 @@
'bar', 'body' => 'foo')。
- * ============================================================================
- * * 版权所有 2005-2012 上海商派网络科技有限公司,并保留所有权利。
- * 网站地址: http://www.ecshop.com;
- * ----------------------------------------------------------------------------
- * 这不是一个自由软件!您只能在不用于商业目的的前提下对程序代码进行修改和
- * 使用;不允许对程序代码以任何形式任何目的的再发布。
- * ============================================================================
- * $Author: liubo $
- * $Id: cls_transport.php 17217 2011-01-19 06:29:08Z liubo $
- */
if (!defined('IN_ECS'))
{
diff --git a/includes/fckeditor/editor/filemanager/connectors/php/config.php b/includes/fckeditor/editor/filemanager/connectors/php/config.php
index 1d8d2e4..407d23b 100755
--- a/includes/fckeditor/editor/filemanager/connectors/php/config.php
+++ b/includes/fckeditor/editor/filemanager/connectors/php/config.php
@@ -57,7 +57,6 @@ require(ROOT_PATH . 'includes/cls_ecshop.php');
require(ROOT_PATH . 'includes/cls_session.php');
require(ROOT_PATH . 'includes/lib_common.php');
-/* ECSHOP */
$ecs = new ECS($db_name, $prefix);
define('DATA_DIR', $ecs->data_dir());
define('IMAGE_DIR', $ecs->image_dir());
@@ -91,7 +90,7 @@ else
$enable = false;
}
-/* ϵͳ */
+/* ����ϵͳ���� */
$_CFG = load_config();
$Config['Enabled'] = $enable;
diff --git a/includes/lib_article.php b/includes/lib_article.php
index 49a7abf..7ae1da0 100755
--- a/includes/lib_article.php
+++ b/includes/lib_article.php
@@ -1,17 +1,5 @@
need_sync || (isset($this->is_ecshop) && $this->is_ecshop))
{
- /* 如果需要同步或是ecshop插件执行这部分代码 */
$sql = "SELECT user_id FROM " . $GLOBALS['ecs']->table('users') . " WHERE ";
$sql .= (is_array($post_id)) ? db_create_in($post_id, 'user_name') : "user_name='". $post_id . "' LIMIT 1";
$col = $GLOBALS['db']->getCol($sql);
@@ -326,7 +325,6 @@ class integrate
if (isset($this->ecshop) && $this->ecshop)
{
- /* 如果是ecshop插件直接退出 */
return;
}
diff --git a/js/calendar.php b/js/calendar.php
index 3246411..83992e5 100755
--- a/js/calendar.php
+++ b/js/calendar.php
@@ -1,18 +1,5 @@
立即免費申請支付接口權限';
$_LANG['alipay_look'] = '請申請成功後登入支付寶帳戶檢視';
-/* 代码增加_start By supplier.68ecshop.com */
$_LANG['02_supplier'] = '供货商管理';
$_LANG['05_supplier_rank'] = '供货商等级';
$_LANG['01_supplier_reg'] = '供货商申请列表';
diff --git a/languages/zh_tw/admin/convert.php b/languages/zh_tw/admin/convert.php
index 25abc98..b8c232c 100755
--- a/languages/zh_tw/admin/convert.php
+++ b/languages/zh_tw/admin/convert.php
@@ -1,26 +1,12 @@
我們的網站尋求協助)';
$_LANG['select_charset'] = '請選擇您要轉換的系統使用的字集:';
$_LANG['note_select_charset'] = '(如果您的系統使用的不是 UTF-8 字集,轉換可能需要較長時間)';
-$_LANG['dir_notes'] = '請注意原商場的根目錄路徑請使用相對於admin目錄的路徑。
例如:原商場的目錄在根目錄下的shop,而ecshop放在根目錄下,則該路徑為 ../shop';
$_LANG['your_config'] = '請設定原系統的組態資訊:';
$_LANG['your_host'] = '主電腦名稱或位址:';
$_LANG['your_user'] = '登入帳號:';
diff --git a/languages/zh_tw/admin/cron.php b/languages/zh_tw/admin/cron.php
index ccba6ce..fc88e3f 100755
--- a/languages/zh_tw/admin/cron.php
+++ b/languages/zh_tw/admin/cron.php
@@ -1,17 +1,5 @@
其它情況都應該輸入完整的網址,如http://www.ecshop.com/';
?>
\ No newline at end of file
diff --git a/languages/zh_tw/admin/filecheck.php b/languages/zh_tw/admin/filecheck.php
index 75d183f..a1cfc31 100755
--- a/languages/zh_tw/admin/filecheck.php
+++ b/languages/zh_tw/admin/filecheck.php
@@ -1,20 +1,7 @@
「被修改」、「被刪除」 中的列出的檔案,請即刻透過FTP或其它工具檢查其檔案的正確性,以確保ECSHOP商店功能的正常使用。
- 「不詳」 中的列出的檔案,請檢查商店是否被人不合法放入了其他檔案
- 「一週內被修改」 中列出的檔案,請確認最近是否修改過。';
$_LANG['filename'] = '檔案名稱';
$_LANG['filesize'] = '檔案大小';
$_LANG['filemtime'] = '最後修改時間';
diff --git a/languages/zh_tw/admin/flashplay.php b/languages/zh_tw/admin/flashplay.php
index 76b13b1..1a2b464 100755
--- a/languages/zh_tw/admin/flashplay.php
+++ b/languages/zh_tw/admin/flashplay.php
@@ -1,17 +1,5 @@
您將只能資源分享該系統的會員資料,但無法生效同時登入。';
$_LANG['points_set'] = '積分兌換設定';
$_LANG['view_user_list'] = '檢視論壇會員';
$_LANG['view_install_log'] = '檢視安裝記錄';
@@ -33,7 +19,6 @@ $_LANG['user_help'] = '
使用方法:
1:如果需要整合其它的會員系統,可以安裝適當的版本號外掛程式進行整合。
2:如果需要更換整合的會員系統,直接安裝目的地外掛程式即可完成整合,同時自動卸除上一次整合外掛程式。
- 3:如果不需要整合任何會員系統,請選擇安裝 ecshop 外掛程式,即可卸除所有的整合外掛程式。
';
/* 查看安?日志 */
@@ -173,12 +158,10 @@ $_LANG['ucenter_opt_database'] = '資料庫方式';
$_LANG['ucenter_opt_interface'] = '接口方式';
$_LANG['ucenter_notice_id'] = '該值為目前商店在 UCenter 的應用 ID,一般情況請不要改動';
-$_LANG['ucenter_notice_key'] = '通訊金鑰用於在 UCenter 和 ECShop 之間傳輸資訊的加密,可含有任何字母及數字,請在 UCenter 與 ECShop 設定完全相同的通訊密鑰,以確保兩套系統能夠正常通信';
$_LANG['ucenter_notice_url'] = '該值在您安裝完 UCenter 後會被初始化,在您 UCenter 位址或者目錄變更的情況下,修改此項,一般情況請不要改動 例如: http://www.sitename.com/uc_server (最後不要加"/")';
$_LANG['ucenter_notice_ip'] = '如果您的伺服器無法透過域名瀏覽 UCenter,可以輸入 UCenter 伺服器的 IP 位址';
$_LANG['ucenter_notice_connect'] = '請根據您的伺服器網路環境選擇適當的連接方式';
$_LANG['ucenter_notice_db_host'] = '可以是本地也可以是遠端資料庫伺服器,如果 MySQL 埠不是預設的 3306,請填寫如下形式:127.0.0.1:6033';
-$_LANG['uc_notice_ip'] = '連接的過程中出了點問題,請您填寫伺服器 IP 位址,如果您的 UC 與 ECShop 裝在同一伺服器上,我們建議您嘗試填寫 127.0.0.1';
$_LANG['uc_lab_url'] = 'UCenter 的 URL:';
$_LANG['uc_lab_pass'] = 'UCenter 創始人密碼:';
diff --git a/languages/zh_tw/admin/license.php b/languages/zh_tw/admin/license.php
index 1011902..7eec454 100755
--- a/languages/zh_tw/admin/license.php
+++ b/languages/zh_tw/admin/license.php
@@ -1,18 +1,5 @@
其它情況都應該輸入完整的網址,如http://www.ecshop.com/';
?>
\ No newline at end of file
diff --git a/languages/zh_tw/admin/pack.php b/languages/zh_tw/admin/pack.php
index bb5e796..0b0ee3b 100755
--- a/languages/zh_tw/admin/pack.php
+++ b/languages/zh_tw/admin/pack.php
@@ -1,17 +1,5 @@
該處理過程可能會比較慢,請您耐心等候。";
$_LANG['change_link'] = '為處理後圖片產生新連結';
diff --git a/languages/zh_tw/admin/plugins.php b/languages/zh_tw/admin/plugins.php
index ee5745e..fadd8cb 100755
--- a/languages/zh_tw/admin/plugins.php
+++ b/languages/zh_tw/admin/plugins.php
@@ -1,17 +1,5 @@
如有需要請到: 系統設定->商店設定->基本設定 開啟網站流量統計服務。';
diff --git a/languages/zh_tw/admin/suppliers.php b/languages/zh_tw/admin/suppliers.php
index 71942f6..6267311 100755
--- a/languages/zh_tw/admin/suppliers.php
+++ b/languages/zh_tw/admin/suppliers.php
@@ -1,17 +1,5 @@
立即免費申請支付接口權限';
$_LANG['alipay_look'] = '請申請成功後登入支付寶帳戶檢視';
-/* 代码增加_start By supplier.68ecshop.com */
$_LANG['02_supplier'] = '供货商管理';
$_LANG['05_supplier_rank'] = '供货商等级';
$_LANG['01_supplier_reg'] = '供货商申请列表';
diff --git a/languages/zh_tw/calendar.php b/languages/zh_tw/calendar.php
index bcd4316..d0c958e 100755
--- a/languages/zh_tw/calendar.php
+++ b/languages/zh_tw/calendar.php
@@ -1,17 +1,5 @@
\ No newline at end of file
diff --git a/languages/zh_tw/shopping_flow.php b/languages/zh_tw/shopping_flow.php
index a7508ee..5205b51 100755
--- a/languages/zh_tw/shopping_flow.php
+++ b/languages/zh_tw/shopping_flow.php
@@ -1,18 +1,5 @@