update .gitignore

.idea/workspace.xml

@@ -1,55 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="5b620213-6142-4839-a88c-acb9f130e070" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/include/chajian/checkChajian.php" beforeDir="false" afterPath="$PROJECT_DIR$/include/chajian/checkChajian.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/include/chajian/downChajian.php" beforeDir="false" afterPath="$PROJECT_DIR$/include/chajian/downChajian.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/include/chajian/inputChajian.php" beforeDir="false" afterPath="$PROJECT_DIR$/include/chajian/inputChajian.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/include/chajian/xinhuapiChajian.php" beforeDir="false" afterPath="$PROJECT_DIR$/include/chajian/xinhuapiChajian.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/include/class/mysql.php" beforeDir="false" afterPath="$PROJECT_DIR$/include/class/mysql.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/include/class/rockClass.php" beforeDir="false" afterPath="$PROJECT_DIR$/include/class/rockClass.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mode/plugin/jquery-rockdatepicker-mobile.js" beforeDir="false" afterPath="$PROJECT_DIR$/mode/plugin/jquery-rockdatepicker-mobile.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/upload/cache/27411e5f0f1d74b4e7f12578a72ca6a8_1640674513" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/flow/input/inputAction.php" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/flow/input/inputAction.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/flow/input/inputjs/input_two.js" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/flow/input/inputjs/input_two.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/flow/input/mode_userAction.php" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/flow/input/mode_userAction.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/flow/input/tpl_input_lu.html" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/flow/input/tpl_input_lu.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/flow/input/tpl_input_lum.html" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/flow/input/tpl_input_lum.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/flow/page/input_user.html" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/flow/page/input_user.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/flow/page/rock_page_demo.php" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/flow/page/rock_page_demo.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/flow/page/rock_page_gong.php" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/flow/page/rock_page_gong.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/flow/page/rock_page_officia.php" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/flow/page/rock_page_officia.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/flow/page/rock_page_officib.php" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/flow/page/rock_page_officib.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/flow/page/rock_page_officic.php" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/flow/page/rock_page_officic.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/flow/page/rock_page_user.php" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/flow/page/rock_page_user.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/home/desktop/footer.php" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/home/desktop/footer.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/index/tpl_index.html" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/index/tpl_index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/login/loginAction.php" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/login/loginAction.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/login/loginscript.js" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/login/loginscript.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/login/tpl_login.html" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/login/tpl_login.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/main/flow/tpl_flow_input.html" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/main/flow/tpl_flow_input.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/main/xinhu/xinhuAction.php" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/main/xinhu/xinhuAction.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/model/agent/agent.php" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/model/agent/agent.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/model/deptModel.php" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/model/deptModel.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/model/fileModel.php" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/model/fileModel.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/model/flow/flow.php" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/model/flow/flow.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/model/flow/userModel.php" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/model/flow/userModel.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/model/loginModel.php" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/model/loginModel.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/model/optionModel.php" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/model/optionModel.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/system/admin/adminAction.php" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/system/admin/adminAction.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/system/cog/cogAction.php" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/system/cog/cogAction.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/system/cog/rock_cog_moreset.php" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/system/cog/rock_cog_moreset.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/system/wxgzh/rock_wxgzh_xcyuser.php" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/system/wxgzh/rock_wxgzh_xcyuser.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/task/api/fileAction.php" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/task/api/fileAction.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/task/api/indexreimAction.php" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/task/api/indexreimAction.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/task/mode/modeview.js" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/task/mode/modeview.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/task/mode/tpl_mode_p.html" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/task/mode/tpl_mode_p.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/task/mode/tpl_mode_x.html" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/task/mode/tpl_mode_x.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/task/runt/beifenAction.php" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/task/runt/beifenAction.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/we/ying/ying.js" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/we/ying/ying.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webmain/webmainAction.php" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/webmainAction.php" afterDir="false" />
-    </list>
+    <list default="true" id="5b620213-6142-4839-a88c-acb9f130e070" name="Default Changelist" comment="" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -118,8 +70,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/webmain/webmainConfig.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-141">
-              <caret line="5" column="50" selection-start-line="5" selection-start-column="50" selection-end-line="5" selection-end-column="50" />
+            <state relative-caret-position="210">
+              <caret line="10" column="39" lean-forward="true" selection-start-line="10" selection-start-column="39" selection-end-line="10" selection-end-column="39" />
             </state>
           </provider>
         </entry>
@@ -345,12 +297,12 @@
       <workItem from="1652089127671" duration="72364000" />
       <workItem from="1655772238925" duration="6883000" />
       <workItem from="1656923308770" duration="2286000" />
-      <workItem from="1656927413592" duration="31072000" />
+      <workItem from="1656927413592" duration="31409000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="304786000" />
+    <option name="totallyTimeSpent" value="305123000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -946,8 +898,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/webmain/webmainConfig.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-141">
-          <caret line="5" column="50" selection-start-line="5" selection-start-column="50" selection-end-line="5" selection-end-column="50" />
+        <state relative-caret-position="210">
+          <caret line="10" column="39" lean-forward="true" selection-start-line="10" selection-start-column="39" selection-end-line="10" selection-end-column="39" />
         </state>
       </provider>
     </entry>

config/config.php

@@ -1,102 +0,0 @@
-<?php
-/**
-*	来自：信呼开发团队
-*	作者：磐石(rainrock)
-*	网址：http://www.rockoa.com/
-*	系统默认配置文件，请不要去修改
-*	要修改配置文件在：webmain/webmainConfig.php
-*/
-@session_start();
-if(function_exists('date_default_timezone_set'))date_default_timezone_set('Asia/Shanghai'); //设置默认时区
-header('Content-Type:text/html;charset=utf-8');
-define('ROOT_PATH',str_replace('\\','/',dirname(dirname(__FILE__))));	//系统跟目录路径
-
-include_once(''.ROOT_PATH.'/include/rockFun.php');
-include_once(''.ROOT_PATH.'/include/Chajian.php');
-include_once(''.ROOT_PATH.'/include/class/rockClass.php');
-$rock 		= new rockClass();
-
-$db			= null;		
-$smarty		= false;
-define('HOST', $rock->host);
-define('REWRITE', 'true');
-if(!defined('PROJECT'))define('PROJECT', $rock->get('p', 'webmain'));
-if(!defined('ENTRANCE'))define('ENTRANCE', 'index');
-
-$config		= array(
-	'title'		=> '信呼',
-	'url'		=> '',
-	'urly'		=> 'http://www.rockoa.com/',	//官网域名地址，修改后就无法提供在线升级了。
-	'db_host'	=> '127.0.0.1',
-	'db_user'	=> 'root',
-	'db_pass'	=> '123456',
-	'db_base'	=> 'rockxinhu',
-	'perfix'	=> '',
-	'qom'		=> '',
-	'highpass'	=> '',
-	'install'	=> false,
-	'version'	=> require('version.php'),
-	'path'		=> 'index',
-	'updir'		=> 'upload',
-	'dbencrypt'	=> false,
-	'sqllog'	=> false,
-	'checksign'	=> false,			//列表请求是否验证
-	'memory_limit'	=> '',			//运行内存大小
-	'timeout'		=> -1,			//抄送时间(秒),-1默认的
-	'db_drive'		=> 'mysqli',	//数据库操作驱动
-	'db_engine'		=> 'MyISAM',	//数据库默认引擎
-	'debug'			=> true,	//默认debug模式
-	'reim_show' 	=> true,	//首页是否显示REIM
-	'mobile_show' 	=> true,	//首页是否显示手机版
-	'accesslogs' 	=> false,	//是否记录访问日志和限制IP
-	'upurl'			=> '', 		//上传文件附件地址(还不能使用)
-	'authorkey'		=> '', 		//系统授权的key，请联系官网获取
-	'companymode'	=> false 	//是否开启多单位模式切换
-);
-
-//引入配置文件
-$_confpath		= $rock->strformat('?0/?1/?1Config.php', ROOT_PATH, PROJECT);
-if(file_exists($_confpath)){
-	$_tempconf	= require($_confpath);
-	foreach($_tempconf as $_tkey=>$_tvs)$config[$_tkey] = $_tvs;
-	if(isempt($config['url']))$config['url'] = $rock->url();
-	if(!isempt($config['memory_limit']) && function_exists('ini_set'))
-		ini_set('memory_limit', $config['memory_limit']);
-	if($config['timeout']>-1 && function_exists('set_time_limit'))set_time_limit($config['timeout']);	
-}
-
-$_confpath	= ''.ROOT_PATH.'/config/author.php';
-if(file_exists($_confpath)){
-	$config['authorkey'] = require($_confpath);
-}
-
-$_confpath	= ''.ROOT_PATH.'/config/xinhuplat.php';
-if(file_exists($_confpath))include_once($_confpath);
-if(!defined('COMPANYNUM'))define('COMPANYNUM', '');
-
-define('DEBUG', $config['debug']);
-error_reporting(DEBUG ? E_ALL : 0);
-
-define('TITLE', $config['title']);
-define('URL', $config['url']);
-define('URLY', $config['urly']);
-define('PATH', $config['path']);
-
-define('DB_DRIVE', $config['db_drive']);
-define('DB_HOST', $config['db_host']);
-define('DB_USER', $config['db_user']);
-define('DB_PASS', $config['db_pass']);
-define('DB_BASE', $config['db_base']);
-
-define('UPDIR', $config['updir']);
-define('PREFIX', $config['perfix']);
-define('QOM', $config['qom']);
-define('VERSION', $config['version']);
-define('HIGHPASS', $config['highpass']);
-define('SYSURL', ''.URL.PATH.'.php');
-define('UPURL', $config['upurl']);
-define('ISMORECOM', $config['companymode']);
-
-$_confpath	= ''.ROOT_PATH.'/config/iplogs.php'; //这个用来限制IP访问的
-if(file_exists($_confpath) && PHP_SAPI != 'cli')include_once($_confpath);
-$rock->initRock();

config/iplist.php

@@ -1,12 +0,0 @@
-<?php
-/**
-*	这个页面是设置黑白名单访问的
-*/
-return array(
-
-	//黑名单IP，多个,分开如：127.0.0.1,192.168.1.100，也可以写192.168.1这样就是现在192.168.1.*所有的
-	'blackip' 	=> '',
-	
-	 //白名单
-	'whiteip'	=> ''
-);

config/iplogs.php

@@ -1,88 +0,0 @@
-<?php
-/**
-*	添加方法日志，和IP限制判断
-*/
-function ipwhiteshow($ip, $rock){
-	$iplist = ''.ROOT_PATH.'/config/iplist.php';
-	$bool 	= 0;
-	if(file_exists($iplist)){
-		$iparr 	= require($iplist);
-	}else{
-		$iparr 	= array(
-			'blackip' 	=> '',
-			'whiteip'	=> '' 
-		);
-	}
-
-	//白名单判断
-	$whiteip = $iparr['whiteip'];
-	if($whiteip!=''){
-		$whiteipa = explode(',', $whiteip);
-		foreach($whiteipa as $ips){
-			$bo = strpos($ip, $ips);
-			if($bo===0 || $ips=='*'){
-				$bool = 1; //可以访问
-				break;
-			}
-		}
-	}
-	
-	//黑名单判断
-	if($bool==0){
-		$blackip = $iparr['blackip'];
-		if($blackip!=''){
-			$blackipa = explode(',', $blackip);
-			foreach($blackipa as $ips){
-				$bo = strpos($ip, $ips);
-				if($bo===0 || $ips=='*'){
-					$bool = 2;//不能访问
-					break;
-				}
-			}
-		}
-	}
-
-	//创建访问日志
-	if(getconfig('accesslogs')){
-		$str = '';
-		foreach($_SERVER as $k=>$v)$str.='['.$k.']:'.$v.chr(10).'';
-		
-		$str1 = '';
-		foreach($_GET as $k=>$v)$str1.='['.$k.']:'.$v.chr(10).'';
-		
-		$str2 = '';
-		foreach($_POST as $k=>$v)$str2.='['.$k.']:'.$v.chr(10).'';
-		$act  = arrvalue($_SERVER,'REQUEST_METHOD');
-		if($act=='POST' && $str2==''){
-			$str2 = arrvalue($GLOBALS, 'HTTP_RAW_POST_DATA');
-		}
-
-		$logs = ''.UPDIR.'/logs/'.date('Y-m-d').'/'.date('H').'/'.date('H.i.s').'_'.$act.'_'.$ip.'_'.rand(100,999).'.log';
-$logstr = '[datetime]:'.$rock->now.'
-[URL]:'.$rock->nowurl().'	
-[ACTION]:'.$act.'
-[IP]:'.$ip.'
-[GET]
-'.$str1.'
-[POST]
-'.$str2.'
-[SERVER]
-'.$str.'	
-';
-		$rock->createtxt($logs, $logstr);
-	}
-	
-	
-	if($bool==2){
-		$logs = ''.UPDIR.'/logs_access/'.date('YmdHis').'_'.rand(100,999).'.log';
-		$logstr = '[datetime]:'.$rock->now.''.chr(10).'[URL]:'.$rock->nowurl().''.chr(10).'[IP]:'.$ip.'';		
-		$rock->createtxt($logs, $logstr);
-		exit('您IP['.$ip.']禁止访问我们站点，有问题请联系我们');
-	}
-}
-
-function ipwhiteshows($ips, $rock){
-	$ipa = explode(',', $ips); 
-	foreach($ipa as $ip)ipwhiteshow($ip, $rock);
-}
-ipwhiteshows($rock->ip, $rock);

config/version.php

@@ -1,3 +0,0 @@
-<?php
-//版本2.3.3最新完整2021
-return '2.3.3';

upload/data/index.html

@@ -1 +0,0 @@
-信呼后台

webmain/webmainConfig.php

@@ -1,44 +0,0 @@
-<?php
-if(!defined('HOST'))die('not access');
-//[管理员]在2021-12-29 17:12:15通过[系统→系统工具→系统设置]，保存修改了配置文件
-return array(
-	'url'	=> '',	//系统URL
-	'localurl'	=> '',	//本地系统URL，用于服务器上浏览地址
-	'title'	=> '信呼协同办公系统',	//系统默认标题
-	'apptitle'	=> '信呼OA',	//APP上和手机网页版上的标题
-	'db_host'	=> '127.0.0.1',	//数据库地址
-	'db_user'	=> 'root',	//数据库用户名
-	'db_pass'	=> '123456',	//数据库密码
-	'db_base'	=> 'rockxinhu',	//数据库名称
-	'db_engine'	=> 'MyISAM',
-	'perfix'	=> 'xinhu_',	//数据库表名前缀
-	'qom'	=> 'xinhu_',	//session、cookie前缀
-	'highpass'	=> '',	//超级管理员密码，可用于登录任何帐号
-	'db_drive'	=> 'mysqli',	//操作数据库驱动有mysql,mysqli,pdo三种
-	'randkey'	=> 'oefrmwbvdliasthkyugxqpcnjz',	//系统随机字符串密钥
-	'asynkey'	=> '9c66ac10153e025aea7665c599a01304',	//这是异步任务key
-	'openkey'	=> '9452b9d7d4c70531b19ef1d435b83225',	//对外接口openkey
-	'updir'	=> 'upload',
-	'sqllog'	=> false,	//是否记录sql日志保存upload/sqllog下
-	'asynsend'	=> '0',	//是否异步发送提醒消息，0同步，1自己服务端异步，2官网VIP用户异步
-	'editpass'	=> '0',	//用户登录修改密码：0不用修改，1强制用户必须修改
-	'install'	=> true,	//已安装，不要去掉啊
-	'xinhukey'	=> 'b9c3626a0136a8628e55bf14b3d892e1',	//信呼官网key，用于在线升级使用
-	'outurl'	=> '',	//这个地址当你内网地址访问时向手机推送消息的地址
-	'reimtitle'	=> '',	//REIM即时通信上标题
-	'qqmapkey'	=> '',
-	'platurl'	=> '',
-	'bcolorxiang'	=> '',	//单据详情页面上默认展示线条的颜色
-	'officeyl'	=> '0',	//文档Excel.Doc预览类型,0自己部署插件，1使用官网支持任何平台
-	'useropt'	=> '',	//1记录用户操作保存到日志里,空不记录
-	'defstype'	=> '1',	//PC后台主题皮肤，可以设置1到34
-	'officebj'	=> '',	//文档在线编辑，1官网提供或者自己部署
-	'officebj_key'	=> '',	//文档在线编辑agentkey
-	'debug'	=> true,	//为true调试开发模式,false上线模式
-	'reim_show'	=> true,	//首页是否显示REIM
-	'mobile_show'	=> true,	//首页是否显示手机版
-	'companymode'	=> false,	//多单位模式，true就是开启
-	'loginyzm'	=> '0',	//登录方式:0仅使用帐号+密码,1帐号+密码/手机+验证码,2帐号+密码+验证码,3仅使用手机+验证码
-	'apptheme'	=> '',	//系统或app的主题颜色
-
-);