]*?)>/is", array($this, 'parse_template_callback_img'), $template);
@@ -199,6 +200,8 @@ class template {
$template = preg_replace_callback("/[\n\r\t]*\{block\s+([a-zA-Z0-9_\[\]]+)\}(.+?)\{\/block\}/is", array($this, 'parse_template_callback_stripblock_12'), $template);
$template = preg_replace("/\<\?(\s{1})/is", "/is", "", $template);
+ $template = str_replace('self.＄','self.$', $template);
+ $template = str_replace('_＄','$', $template);
}
function parse_template_callback_javascript($matches) {
diff --git a/core/class/dzz/dzz_app.php b/core/class/dzz/dzz_app.php
index 4d4ad6a..ec6c423 100644
--- a/core/class/dzz/dzz_app.php
+++ b/core/class/dzz/dzz_app.php
@@ -50,7 +50,7 @@ class dzz_app extends dzz_base{
return $object;
}
- public function __construct($params=array()) {
+ public function __construct($params) {
foreach($params as $k=>$v){
$this->$k = $v;
}
@@ -77,21 +77,11 @@ class dzz_app extends dzz_base{
public function init() {
if(!$this->initated) {
- if($this->init_setting){
- $this->_init_setting();
- }
- if($this->init_user){
- $this->_init_user();
- }
- if($this->init_session){
- $this->_init_session();
- }
- if($this->init_cron){
- $this->_init_cron();
- }
- if($this->init_misc){
- $this->_init_misc();
- }
+ $this->_init_setting();
+ $this->_init_user();
+ $this->_init_session();
+ $this->_init_cron();
+ $this->_init_misc();
}
$this->initated = true;
}
@@ -151,6 +141,7 @@ class dzz_app extends dzz_base{
'PHP_SELF' => '',
'siteurl' => '',
'localurl' => '',
+ 'siteroot' => '',
'siteport' => '',
@@ -656,7 +647,6 @@ class dzz_app extends dzz_base{
}
private function _init_setting() {
- global $_G;
if($this->init_setting) {
if(empty($this->var['setting'])) {
$this->cachelist[] = 'setting';
@@ -669,7 +659,7 @@ class dzz_app extends dzz_base{
!empty($this->cachelist) && loadcache($this->cachelist);
if(!is_array($this->var['setting'])) {
- $this->var['setting'] =C::t('setting')->fetch_all();
+ $this->var['setting'] = array();
}
if($ismobile=helper_browser::ismobile()) define('IN_MOBILE',$ismobile);
define('VERHASH',isset($this->var['setting']['verhash'])?$this->var['setting']['verhash']:random(3));
diff --git a/core/class/dzz/dzz_notification.php b/core/class/dzz/dzz_notification.php
index 6bbae8d..52a48a3 100644
--- a/core/class/dzz/dzz_notification.php
+++ b/core/class/dzz/dzz_notification.php
@@ -52,10 +52,9 @@ class dzz_notification {
'from_num' => ($oldnote['from_num']+$notevars['from_num']),
'category'=>$category
);
- /*if($category==1) {
- $setarr['authorid'] = 0;
- $setarr['author'] = '';
- }*/
+ $redirect = (strpos($redirect, 'http://') === 0 || strpos($redirect, 'https://') === 0)
+ ? $redirect
+ : $_G['siteurl'] . $redirect;
$_G['setting']['mail'] = dunserialize($_G['setting']['mail']);
if($_G['setting']['mail']['tzxxyjtz']) {
//发送邮件
@@ -66,7 +65,7 @@ class dzz_notification {
尊敬的用户$member[username],您好！
$notestring
链接：
- $_G[siteurl]$redirect,(如果上面不是链接形式，请将该地址手工粘贴到浏览器地址栏再访问)
+ $redirect,(如果上面不是链接形式，请将该地址手工粘贴到浏览器地址栏再访问)
EOT;
;
if(!sendmail("$member[username] <$member[email]>", $title, $youjiantz)) {
diff --git a/core/class/io/io_dzz.php b/core/class/io/io_dzz.php
index c02bd80..6e2b0fc 100644
--- a/core/class/io/io_dzz.php
+++ b/core/class/io/io_dzz.php
@@ -355,85 +355,6 @@ class io_dzz extends io_api
}
exit();
}
-
- /*//将文件内容保存成文件，放入附件表
- private function saveFilecontentToAttach($icoarr,$filecontent){
- global $_G;
- //保存的文件名
- $filename = $icoarr['name'];
- $pathinfo = pathinfo($filename);
- //获取后缀名
- $ext = strtolower($pathinfo['extension']);
- //生成路径
- $target = $this->getPath($ext ? ('.' . $ext) : '', 'dzz');
-
- if (!empty($fileContent) && !file_put_contents($_G['setting']['attachdir'] . $target, $fileContent)) {
- return array('error' => lang('cache_file_error'));
- }
- //判断空间大小
- $gid = DB::result_first("select gid from %t where fid=%d", array('folder', $icoarr['pfid']));
- if (!SpaceSize(filesize($_G['setting']['attachdir'] . $target), $gid)) {
- @unlink($_G['setting']['attachdir'] . $target);
- return array('error' => lang('inadequate_capacity_space'));
- }
- //保存到附件表
- if ($attach = $this->save($target, $filename)) {
- return $attach;
- } else {
- return array('error' => 'Could not save uploaded file. The upload was cancelled, or server error encountered');
- }
- }*/
- /* //将文件内容作为新版本保存(用于保存时，选择文件覆盖的情形)
- private function coverFilebynewVersion($attach, $icoarr)
- {
- global $_G;
- $setting = $_G['setting'];
- //当前文件版本数量
- $versionnum = DB::result_first("select count(*) from %t where rid = %s", array('resources_version', $icoarr['rid']));
- //
- //版本开启
- $vperm = (!isset($setting['fileVersion']) || $setting['fileVersion']) ? true : false;
- //版本数量限制
- $vnumlimit = isset($setting['fileVersionNumber']) ? intval($setting['fileVersionNumber']) : 0;
- $covertype = 0;
- //当上传版本开启，上传版本数量不限制；或者上传版本开启，文件版本数量未达到上限：设置当前文件为最新版本
- if ($vperm && (!$vnumlimit || ($vnumlimit && ($versionnum < $vnumlimit)))) {
- $covertype = 1;
- //当上传版本关闭，并且文件包含版本；或者上传版本开启，并且版本数量达到上限：剔除最老版本，并设置新文件为主版本
- } elseif ((!$vperm && $versionnum > 0) || ($vperm && $vnumlimit && $versionnum > $vnumlimit)) {
- $covertype = 2;
- //当上传版本关闭，且当前文件不含有版本：替换当前文件
- } elseif (!$vperm && !$versionnum) {
- $covertype = 3;
- }
- if ($covertype == 1) {
- $setarr = array(
- 'uid' => $_G['uid'],
- 'username' => $_G['username'],
- 'name' => $attach['filename'],
- 'aid' => $attach['aid'],
- 'size' => $attach['filesize'],
- 'ext' => $attach['filetype'],
- 'dateline' => TIMESTAMP
- );
- $return = C::t('resources_version')->add_new_version_by_rid($icoarr['rid'], $setarr);
- } elseif ($covertype == 2) {
- $setarr = array(
- 'uid' => $_G['uid'],
- 'username' => $_G['username'],
- 'name' => $attach['filename'],
- 'aid' => $attach['aid'],
- 'size' => $attach['filesize'],
- 'ext' => $attach['filetype'],
- 'dateline' => TIMESTAMP
- );
- $return = C::t('resources_version')->add_new_version_by_rid($icoarr['rid'], $setarr);
- $vid = DB::result_first("select min(dateline),vid from %t where rid = %s ", array('resources_version', $icoarr['rid']));
- C::t('rescources_version')->delete_by_vid($vid, $icoarr['rid']);
- } elseif ($covertype == 3) {
-
- }
- }*/
//@param number $rid 文件的rid
//@param string $message 文件的新内容
public function setFileContent($rid, $fileContent, $force = false, $nocover = true)
diff --git a/core/template/default/common/footer.htm b/core/template/default/common/footer.htm
index 9ed04a7..145313f 100644
--- a/core/template/default/common/footer.htm
+++ b/core/template/default/common/footer.htm
@@ -37,101 +37,6 @@ try{
$_G['setting']['statcode']
-
-
-
+