hexianglong/Pichome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新到正式版1.0

Browse Source
This commit is contained in:
zyx0814
2022-05-02 22:31:35 +08:00
Unverified
parent 22d2a07209
commit a0f3e375e4
540 changed files with 95625 additions and 111495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
dzz/billfish/class/class_billfishexport.php
View File

@@ -128,7 +128,7 @@ class billfishxport
if (!$this->filenum) {
C::t('pichome_vapp')->update($this->appid, array('state' => 4));
} else {
C::t('pichome_vapp')->update($this->appid, array('state' => 2, 'filenum' => $this->filenum));
C::t('pichome_vapp')->update($this->appid, array('state' => 2, 'filenum' => $this->filenum,'donum'=>0,'percent'=>0,'lastid'=>0));
}
return array('success' => true);
}
@@ -397,9 +397,11 @@ class billfishxport
$state = ($percent >= 100) ? 3 : 2;
if ($state == 3) {
$lastid = 0;
$percent = 0;
$this->donum = 0;
}
//记录导入起始位置，以备中断后从此处,更改导入状态
C::t('pichome_vapp')->update($this->appid, array('percent' => $percent, 'donum' => $this->donum, 'state' => $state));
C::t('pichome_vapp')->update($this->appid, array('percent' => $percent, 'donum' => $this->donum, 'state' => $state,'filenum'=>$this->filenum));
}
if($state == 2){
@@ -643,10 +645,12 @@ class billfishxport
$state = ($percent >= 100) ? 3 : 2;
if ($state == 3) {
$lastid = 0;
$percent = 0;
$this->donum = 0;
}
//记录导入起始位置，以备中断后从此处,更改导入状态
C::t('pichome_vapp')->update($this->appid, array('percent' => $percent, 'donum' => $this->donum, 'state' => $state));
C::t('pichome_vapp')->update($this->appid, array('percent' => $percent, 'donum' => $this->donum, 'state' => $state,'filenum'=>$this->filenum));
}
$lastid = $lastid+1;
@@ -730,18 +734,21 @@ class billfishxport
foreach ($data as $v) {
$rid = $v['rid'];
$iid = DB::result_first("select bid from %t where rid = %s and appid = %s",array('billfish_record',$rid,$this->appid));
if($this->version < 30){
$sql = "select count(s.id) as num from source s left join res_prop rp on s.id = rp.iid where rp.action =0 and s.id = $iid";
}else{
//查询billfish中是否有该数据
$sql = "select count(f.id) as num from bf_file f left join bf_material m on f.id = m.file_id where m.is_recycle =0 and f.id = $iid";
}
$numdata = $this->fetch($sql);
if(!isset($numdata['num']) || !$numdata['num']){
if(!$iid){
$delrids[] = $rid;
}else{
if($this->version < 30){
$sql = "select count(s.id) as num from source s left join res_prop rp on s.id = rp.iid where rp.action =0 and s.id = $iid";
}else{
//查询billfish中是否有该数据
$sql = "select count(f.id) as num from bf_file f left join bf_material m on f.id = m.file_id where m.is_recycle =0 and f.id = $iid";
}
$numdata = $this->fetch($sql);
if(!isset($numdata['num']) || !$numdata['num']){
$delrids[] = $rid;
}
}
}
if (!empty($delrids)) {
$this->filenum = $this->filenum - count($delrids);

6
dzz/billfish/class/table/table_billfish_record.php
View File

@@ -39,5 +39,11 @@ class table_billfish_record extends dzz_table
DB::delete($this->_table,array('appid'=>$appid));
}
public function delete_by_rids($rids){
if (!is_array($rids)) $rids = (array)$rids;
DB::delete($this->_table,'rid in ('.dimplode($rids).')');
}
}

20
dzz/billfish/classes/deleteafter.php Normal file
View File

@@ -0,0 +1,20 @@
<?php
namespace dzz\billfish\classes;
use \core as C;
use \DB as DB;
class deleteafter
{
public function run($data)
{
C::t('#billfish#billfish_record')->delete_by_rids($data['rids']);
}
}

4
dzz/billfish/classes/delpichomefolderafter.php
View File

@@ -9,9 +9,9 @@ use \fmpeg as fmpeg;
class delpichomefolderafter
{
public function run($appid)
public function run($data)
{
C::t("#billfish#billfish_folderrecord")->delete_by_appid($appid);
C::t("#billfish#billfish_folderrecord")->delete_by_appid($data['appid']);
}