Skip to content

Commit a21f2ab

Browse files
shannahshannah
committed
Changed most imports to use absolute paths to take advantage of opcache in php7
1 parent 7562076 commit a21f2ab

File tree

106 files changed

+374
-305
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+374
-305
lines changed

‎Dataface/ActionTool.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
1919
*-------------------------------------------------------------------------------
2020
*/
21-
import('Dataface/LanguageTool.php');
21+
import(XFROOT.'Dataface/LanguageTool.php');
2222

2323
/**
2424
* A tool to manage actions within the application.
@@ -44,7 +44,7 @@ function Dataface_ActionTool($conf=null) { self::__construct($conf); }
4444

4545
function _loadActionsINIFile(/*$path*/){
4646

47-
import('Dataface/ConfigTool.php');
47+
import(XFROOT.'Dataface/ConfigTool.php');
4848
$configTool =& Dataface_ConfigTool::getInstance();
4949
$actions =& $configTool->loadConfig('actions', null);
5050
foreach ( array_keys($actions) as $key){
@@ -73,7 +73,7 @@ function _loadActionsINIFile(/*$path*/){
7373
}
7474

7575
function _loadTableActions($tablename){
76-
import('Dataface/Table.php');
76+
import(XFROOT.'Dataface/Table.php');
7777
// Some actions are loaded from the table's actions.ini file and must be loaded before we return the actions.
7878

7979
$table =& Dataface_Table::loadTable($tablename);

‎Dataface/Application.php

+16-16
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ function sys_get_temp_dir()
6161
}
6262

6363
require_once dirname(__FILE__)."/../config.inc.php";
64-
import('Dataface/PermissionsTool.php');
65-
import('Dataface/LanguageTool.php');
64+
import(XFROOT.'Dataface/PermissionsTool.php');
65+
import(XFROOT.'Dataface/LanguageTool.php');
6666
define('DATAFACE_STRICT_PERMISSIONS', 100);
6767
// the minimum security level that is deemed as strict permissions.
6868
// strict permissions mean that permissions must be explicitly granted to a
@@ -700,7 +700,7 @@ function __construct($conf = null) {
700700

701701

702702
if ( isset($this->_conf['_modules']) and count($this->_conf['_modules'])>0 ){
703-
import('Dataface/ModuleTool.php');
703+
import(XFROOT.'Dataface/ModuleTool.php');
704704
}
705705

706706
if ( isset($this->_conf['languages']) ){
@@ -895,7 +895,7 @@ function __construct($conf = null) {
895895
} else if (isset( $_COOKIE[$prefix.'lang']) ){
896896
$this->_conf['lang'] = $_COOKIE[$prefix.'lang'];
897897
} else {
898-
import('I18Nv2/I18Nv2.php');
898+
import(XFLIB.'I18Nv2/I18Nv2.php');
899899
$negotiator = I18Nv2::createNegotiator($this->_conf['default_language'], 'UTF-8');
900900
$this->_conf['lang'] = $this->getLanguageCode(
901901
$negotiator->getLocaleMatch(
@@ -934,11 +934,11 @@ function __construct($conf = null) {
934934
define('DATAFACE_USAGE_MODE', $this->_conf['usage_mode']);
935935

936936
if ( @$this->_conf['enable_workflow'] ){
937-
import('Dataface/WorkflowTool.php');
937+
import(XFROOT.'Dataface/WorkflowTool.php');
938938
}
939939

940940
if (@$_GET['--url']) {
941-
import('actions/request_public_url.php');
941+
import(XFROOT.'actions/request_public_url.php');
942942
// This allows the use of a public URL for setting
943943
// both the query and the logged in user.
944944
dataface_actions_request_public_url::apply_url($this);
@@ -1313,7 +1313,7 @@ function &getResultSet(){
13131313
// Do whatever we need to do before the request is handled.
13141314
$applicationDelegate->beforeLoadResultSet();
13151315
}
1316-
import('Dataface/QueryTool.php');
1316+
import(XFROOT.'Dataface/QueryTool.php');
13171317
$this->queryTool = Dataface_QueryTool::loadResult($this->_query['-table'], $this->db(), $this->_query);
13181318
}
13191319
return $this->queryTool;
@@ -1491,7 +1491,7 @@ function recordLoaded(){
14911491
* @return array Action parameters (or null if action doesn't exist).
14921492
*/
14931493
function &getAction(){
1494-
import('Dataface/ActionTool.php');
1494+
import(XFROOT.'Dataface/ActionTool.php');
14951495
$actionTool = Dataface_ActionTool::getInstance();
14961496
return $actionTool->getAction(array('name'=>$this->_query['-action']));
14971497
}
@@ -1814,7 +1814,7 @@ function &getAuthenticationTool(){
18141814
if ( !isset($this->authenticationTool) ){
18151815

18161816
if ( isset($this->_conf['_auth']) ){
1817-
import('Dataface/AuthenticationTool.php');
1817+
import(XFROOT.'Dataface/AuthenticationTool.php');
18181818
$this->authenticationTool = Dataface_AuthenticationTool::getInstance($this->_conf['_auth']);
18191819
} else {
18201820
return $null;
@@ -2173,14 +2173,14 @@ function handleRequest($disableCache=false){
21732173

21742174

21752175
if ( !$disableCache and (@$_GET['-action'] != 'getBlob') and isset( $this->_conf['_output_cache'] ) and @$this->_conf['_output_cache']['enabled'] and count($_POST) == 0){
2176-
import('Dataface/OutputCache.php');
2176+
import(XFROOT.'Dataface/OutputCache.php');
21772177
$oc = new Dataface_OutputCache($this->_conf['_output_cache']);
21782178
$oc->ob_start();
21792179

21802180
}
2181-
import('Dataface/ActionTool.php');
2182-
import('Dataface/PermissionsTool.php');
2183-
import('Dataface/Table.php');
2181+
import(XFROOT.'Dataface/ActionTool.php');
2182+
import(XFROOT.'Dataface/PermissionsTool.php');
2183+
import(XFROOT.'Dataface/Table.php');
21842184

21852185
if ( isset($this->_conf['_modules']) and count($this->_conf['_modules']) > 0 ){
21862186
$mt = Dataface_ModuleTool::getInstance();
@@ -2687,7 +2687,7 @@ function _display($main_content_only=false, $disableCache=false){
26872687
* @private
26882688
*/
26892689
function _handleGetBlob($request){
2690-
import('Dataface/Application/blob.php');
2690+
import(XFROOT.'Dataface/Application/blob.php');
26912691
return Dataface_Application_blob::_handleGetBlob($request);
26922692
}
26932693

@@ -2973,7 +2973,7 @@ function testCondition($condition, $context=null){
29732973
*
29742974
*/
29752975
function url($query, $useContext=true, $forceContext=false){
2976-
import('Dataface/LinkTool.php');
2976+
import(XFROOT.'Dataface/LinkTool.php');
29772977
return Dataface_LinkTool::buildLInk($query, $useContext, $forceContext);
29782978

29792979
}
@@ -3227,7 +3227,7 @@ function refreshSchemas($tablename){
32273227
* @return array
32283228
*/
32293229
function _parseRelatedBlobRequest($request){
3230-
import('Dataface/Application/blob.php');
3230+
import(XFROOT.'Dataface/Application/blob.php');
32313231
return Dataface_Application_blob::_parseRelatedBlobRequest($request);
32323232
}
32333233

‎Dataface/Application/blob.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class Dataface_Application_blob {
3333

3434
static function _parseRelatedBlobRequest($request){
3535
$app = Dataface_Application::getInstance();
36-
import('dataface-public-api.php');
36+
import(XFROOT.'dataface-public-api.php');
3737
if ( !isset( $request['-field'] ) ) die("Could not complete request. No field name specified.");
3838
if ( !isset( $request['-table'] ) ) die("Could not complete request. No table specified.");
3939

@@ -81,8 +81,8 @@ static function _parseRelatedBlobRequest($request){
8181
*/
8282
static function _handleGetBlob($request){
8383
$app = Dataface_Application::getInstance();
84-
import( 'Dataface/Table.php');
85-
import('Dataface/QueryTool.php');
84+
import( XFROOT.'Dataface/Table.php');
85+
import(XFROOT.'Dataface/QueryTool.php');
8686

8787
if ( strpos(@$request['-field'], '.') !== false ){
8888
$request = self::_parseRelatedBlobRequest($request);

‎Dataface/AuthenticationTool.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* Description:
2727
* Handles authentication for Dataface application.
2828
*/
29-
import('Dataface/Table.php');
29+
import(XFROOT.'Dataface/Table.php');
3030
class Dataface_AuthenticationTool {
3131

3232
var $authType = 'basic';
@@ -217,7 +217,7 @@ function checkCredentials(){
217217
//throw new Exception("Username or Password Not specified", E_USER_ERROR);
218218
return false;
219219
}
220-
import('Dataface/Serializer.php');
220+
import(XFROOT.'Dataface/Serializer.php');
221221
$serializer = new Dataface_Serializer($this->usersTable);
222222
//$res = xf_db_query(
223223
$sql = "SELECT `".$this->usernameColumn."` FROM `".$this->usersTable."`
@@ -304,7 +304,7 @@ function authenticate(){
304304
exit;
305305
}
306306

307-
import('Dataface/Utilities.php');
307+
import(XFROOT.'Dataface/Utilities.php');
308308

309309
Dataface_Utilities::fireEvent('after_action_logout', array('UserName'=>$username));
310310

@@ -363,7 +363,7 @@ function authenticate(){
363363
// userid in the session.
364364
$_SESSION['UserName'] = $creds['UserName'];
365365

366-
import('Dataface/Utilities.php');
366+
import(XFROOT.'Dataface/Utilities.php');
367367

368368
Dataface_Utilities::fireEvent('after_action_login', array('UserName'=>$_SESSION['UserName']));
369369
$msg = df_translate('You are now logged in','You are now logged in');
@@ -564,7 +564,7 @@ function isLockedOut(){
564564

565565
function getEmailColumn(){
566566
if ( !isset($this->emailColumn) ){
567-
import('Dataface/Ontology.php');
567+
import(XROOT.'Dataface/Ontology.php');
568568
Dataface_Ontology::registerType('Person', 'Dataface/Ontology/Person.php', 'Dataface_Ontology_Person');
569569
$ontology = Dataface_Ontology::newOntology('Person', $this->usersTable);
570570
if ( isset($this->conf['email_column']) ) $this->emailColumn = $this->conf['email_column'];

‎Dataface/Clipboard.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
2-
import('Dataface/AuthenticationTool.php');
3-
import('Dataface/IO.php');
4-
define('Dataface_Clipboard_tablename', '_df_clipboard');
5-
define('Dataface_Clipboard_lifetime', 1800);
6-
define('Dataface_Clipboard_threshold', 20);
7-
define('Dataface_Clipboard_clipboard_id_key', '_df_clipboard_id');
2+
import(XFROOT.'Dataface/AuthenticationTool.php');
3+
import(XFROOT.'Dataface/IO.php');
4+
define(XFROOT.'Dataface_Clipboard_tablename', '_df_clipboard');
5+
define(XFROOT.'Dataface_Clipboard_lifetime', 1800);
6+
define(XFROOT.'Dataface_Clipboard_threshold', 20);
7+
define(XFROOT.'Dataface_Clipboard_clipboard_id_key', '_df_clipboard_id');
88

99
/**
1010
* A clipboard class to enable users to cut and paste records between relationships

‎Dataface/ConfigTool.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -543,17 +543,17 @@ function buildConfigQuery($path, $username, $lang, $where=null){
543543

544544

545545
function createConfigTable(){
546-
import('Dataface/ConfigTool/createConfigTable.function.php');
546+
import(XFROOT.'Dataface/ConfigTool/createConfigTable.function.php');
547547
return Dataface_ConfigTool_createConfigTable();
548548
}
549549

550550
function setConfigParam($file, $section, $key, $value, $username=null, $lang=null, $priority=5){
551-
import('Dataface/ConfigTool/setConfigParam.function.php');
551+
import(XFROOT.'Dataface/ConfigTool/setConfigParam.function.php');
552552
return Dataface_ConfigTool_setConfigParam($file, $section, $key, $value, $username, $lang, $priority);
553553
}
554554

555555
function clearConfigParam($file, $section, $key, $value, $username=null, $lang=null){
556-
import('Dataface/ConfigTool/clearConfigParam.function.php');
556+
import(XFROOT.'Dataface/ConfigTool/clearConfigParam.function.php');
557557
return Dataface_ConfigTool_setConfigParam($file, $section, $key, $value, $username, $lang);
558558
}
559559

‎Dataface/DB.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
* xf_db_query calls because it analyzes queries first to make sure that Blobs are
2929
* not loaded unnecessarily. [To do]
3030
*/
31-
import( 'Dataface/Application.php');
32-
import('Dataface/Table.php');
33-
import('Dataface/AuthenticationTool.php');
31+
import( XFROOT.'Dataface/Application.php');
32+
import(XFROOT.'Dataface/Table.php');
33+
import(XFROOT.'Dataface/AuthenticationTool.php');
3434

3535
class Dataface_DB {
3636
var $_db;
@@ -123,7 +123,7 @@ function cache($key, $value, $lang=null){
123123
function &_getParser(){
124124

125125
if ( !isset($this->_parser)){
126-
import('SQL/Parser.php');
126+
import(XFLIB.'SQL/Parser.php');
127127
$this->_parser = new SQL_Parser(null, 'MySQL');
128128
}
129129
return $this->_parser;
@@ -134,7 +134,7 @@ function &_getParser(){
134134
*/
135135
function &_getCompiler(){
136136
if ( !isset($this->_compiler) ){
137-
import('SQL/Compiler.php');
137+
import(XFLIB.'SQL/Compiler.php');
138138
$this->_compiler = SQL_Compiler::newInstance('mysql');
139139
}
140140
return $this->_compiler;
@@ -285,7 +285,7 @@ function translate_query($query, $lang=null){
285285
}
286286

287287
$query = $prepared_query[0];
288-
import('Dataface/QueryTranslator.php');
288+
import(XFROOT.'Dataface/QueryTranslator.php');
289289
$translator = new Dataface_QueryTranslator($lang);
290290
$output = $translator->translateQuery($prepared_query[0]);
291291
if (PEAR::isError($output) ){
@@ -650,7 +650,7 @@ function getTableDependencies($sql, $lang=null){
650650
}
651651
// We actually need to calculate the dependencies, so we will
652652
// parse the SQL query.
653-
import('SQL/Parser.php');
653+
import(XFLIB.'SQL/Parser.php');
654654
$parser = new SQL_Parser( null, 'MySQL');
655655
$data = $parser->parse($sql);
656656
if ( PEAR::isError($data) ){

‎Dataface/DeleteForm.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
1919
*-------------------------------------------------------------------------------
2020
*/
21-
import( 'HTML/QuickForm.php');
22-
import('Smarty/Smarty.class.php');
23-
import('Dataface/Globals.php');
24-
import('Dataface/QueryBuilder.php');
21+
import( XFLIB.'HTML/QuickForm.php');
22+
import(XFLIB.'Smarty/Smarty.class.php');
23+
import(XFROOT.'Dataface/Globals.php');
24+
import(XFROOT.'Dataface/QueryBuilder.php');
2525

2626

2727
/**
@@ -158,7 +158,7 @@ function display(){
158158
}
159159

160160
$context = array('msg'=>$msg, 'form'=>$form);
161-
import('Dataface/SkinTool.php');
161+
import(XFROOT.'Dataface/SkinTool.php');
162162
$skinTool =& Dataface_SkinTool::getInstance();
163163
//$smarty = new Smarty;
164164
//$smarty->template_dir = $GLOBALS['Dataface_Globals_Templates'];
@@ -253,8 +253,8 @@ function checkPermissions(){
253253
$errors = array();
254254
if ( $this->isSubmitted() ){
255255
$errCounter = 1;
256-
import('Dataface/PermissionsTool.php');
257-
import('dataface-public-api.php');
256+
import(XFROOT.'Dataface/PermissionsTool.php');
257+
import(XFROOT.'dataface-public-api.php');
258258
$query = $this->_buildDeleteQuery($this->exportValues());
259259
if ( PEAR::isError($query) ){
260260
$errors[$errCounter++] = $query->getMessage();

‎Dataface/FeedTool.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ function &getConfig(){
248248
}
249249

250250
function createFeed($query=null){
251-
import('feedcreator.class.php');
251+
import(XFLIB.'feedcreator.class.php');
252252
$app =& Dataface_Application::getInstance();
253253
if ( !isset($query) ){
254254
$query = $app->getQuery();

‎Dataface/FormTool.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -968,7 +968,7 @@ function _compareGroups($g1, $g2){
968968
function display(&$form, $template=null, $singleField=false, $useTabs=false){
969969

970970

971-
import('HTML/QuickForm/Renderer/ArrayDataface.php');
971+
import(XFROOT.'HTML/QuickForm/Renderer/ArrayDataface.php');
972972
//$skinTool =& Dataface_SkinTool::getInstance();
973973
$renderer = new HTML_QuickForm_Renderer_ArrayDataface(true);
974974
$form->accept($renderer);
@@ -1577,7 +1577,7 @@ function saveSession($record, $new=false, $session_key = null ){
15771577

15781578
}
15791579

1580-
import('HTML/QuickForm.php');
1580+
import(XFLIB.'HTML/QuickForm.php');
15811581
/**
15821582
* @brief An HTML_QuickForm class that can be used to build widgets that will eventually
15831583
* be added to other forms. It is the same as any other quickform except that it

‎Dataface/FormTool/checkbox.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function &buildWidget(&$record, &$field, &$form, $formFieldName, $new=false){
2626
if ( !@$widget['suffix'] ) $widget['suffix'] = '';
2727
$dtable = & Dataface_Table::loadTable($relationship->getDomainTable());
2828
if ( !PEAR::isError($dtable) and $record->checkPermission('add new related record', array('relationship'=>$relationship->getName()) )){
29-
import('Dataface/JavascriptTool.php');
29+
import(XFROOT.'Dataface/JavascriptTool.php');
3030
$jt = Dataface_JavascriptTool::getInstance();
3131
$jt->import('xataface/widgets/checkbox.js');
3232

‎Dataface/FormTool/file.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ function pushValue(&$record, &$field, &$form, &$element, &$metaValues){
149149
}
150150
}
151151

152-
import('xf/image/crop.php');
152+
import(XFROOT.'xf/image/crop.php');
153153
$crop = new \xf\image\Crop;
154154

155155
list($dimensions) = array_map('trim', explode(' ', $arg));

‎Dataface/FormTool/group.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
import('Dataface/FormTool/table.php');
2+
import(XFROOT.'Dataface/FormTool/table.php');
33
/**
44
* @ingroup widgetsAPI
55
*/

‎Dataface/FormTool/meta.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
import('Dataface/FormTool/hidden.php');
2+
import(XFROOT.'Dataface/FormTool/hidden.php');
33
/**
44
* @ingroup widgetsAPI
55
*/

‎Dataface/FormTool/webcam.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22

33

4-
import('Dataface/FormTool/file.php');
4+
import(XFROOT.'Dataface/FormTool/file.php');
55
/**
66
* @ingroup widgetsAPI
77
*/

0 commit comments

Comments
 (0)