diff options
author | Egor <egor.26.93@gmail.com> | 2015-06-11 16:11:13 +0300 |
---|---|---|
committer | Egor <egor.26.93@gmail.com> | 2015-06-11 16:11:13 +0300 |
commit | 5fbd0adda5155853e86001fad4c571008f09f01b (patch) | |
tree | 6d7bfbb84025de8e56afb2eb1e1dcbd6dad2c0a2 | |
parent | 5992398183bf84c87dd4315d1532d10022718e9b (diff) | |
download | connector-php-5fbd0adda5155853e86001fad4c571008f09f01b.zip connector-php-5fbd0adda5155853e86001fad4c571008f09f01b.tar.gz connector-php-5fbd0adda5155853e86001fad4c571008f09f01b.tar.bz2 |
Updated namespaces for psr-0.
49 files changed, 96 insertions, 96 deletions
diff --git a/codebase/Dhtmlx/Connector/Connector.php b/codebase/Dhtmlx/Connector/Connector.php index de870f3..7513906 100644 --- a/codebase/Dhtmlx/Connector/Connector.php +++ b/codebase/Dhtmlx/Connector/Connector.php @@ -1,22 +1,22 @@ <?php -namespace DHTMLX\Connector; - -use DHTMLX\Connector\Tools\EventMaster; -use DHTMLX\Connector\Tools\AccessMaster; -use DHTMLX\Connector\Tools\LogMaster; -use DHTMLX\Connector\Output\RenderStrategy; -use DHTMLX\Connector\Output\OutputWriter; -use DHTMLX\Connector\DataStorage\DataConfig; -use DHTMLX\Connector\DataStorage\DataAction; -use DHTMLX\Connector\DataStorage\DataRequestConfig; -use DHTMLX\Connector\DataStorage\MySQLDBDataWrapper; -use DHTMLX\Connector\DataStorage\ArrayDBDataWrapper; -use DHTMLX\Connector\DataStorage\PHPYii2DBDataWrapper; -use DHTMLX\Connector\Data\CommonDataProcessor; -use DHTMLX\Connector\XSSFilter\ConnectorSecurity; -use DHTMLX\Connector\Event\SortInterface; -use DHTMLX\Connector\Event\FilterInterface; +namespace Dhtmlx\Connector; + +use Dhtmlx\Connector\Tools\EventMaster; +use Dhtmlx\Connector\Tools\AccessMaster; +use Dhtmlx\Connector\Tools\LogMaster; +use Dhtmlx\Connector\Output\RenderStrategy; +use Dhtmlx\Connector\Output\OutputWriter; +use Dhtmlx\Connector\DataStorage\DataConfig; +use Dhtmlx\Connector\DataStorage\DataAction; +use Dhtmlx\Connector\DataStorage\DataRequestConfig; +use Dhtmlx\Connector\DataStorage\MySQLDBDataWrapper; +use Dhtmlx\Connector\DataStorage\ArrayDBDataWrapper; +use Dhtmlx\Connector\DataStorage\PHPYii2DBDataWrapper; +use Dhtmlx\Connector\Data\CommonDataProcessor; +use Dhtmlx\Connector\XSSFilter\ConnectorSecurity; +use Dhtmlx\Connector\Event\SortInterface; +use Dhtmlx\Connector\Event\FilterInterface; class Connector { protected $config;//DataConfig instance @@ -66,15 +66,15 @@ class Connector { */ public function __construct($db,$type=false, $item_type=false, $data_type=false, $render_type = false){ $this->exec_time=microtime(true); - $dsnamespace = "DHTMLX\\Connector\\DataStorage\\"; + $dsnamespace = "Dhtmlx\\Connector\\DataStorage\\"; if (!$type) $type=$dsnamespace."MySQLDBDataWrapper"; //die(var_dump(class_exists("DataConfig",true), new MySQLDBDataWrapper)); if (class_exists($dsnamespace.$type."DBDataWrapper",true)) $type.="DBDataWrapper"; - if (!$item_type) $item_type="DHTMLX\\Connector\\Data\\DataItem"; - if (!$data_type) $data_type="DHTMLX\\Connector\\Data\\DataProcessor"; - if (!$render_type) $render_type="DHTMLX\\Connector\\Output\\RenderStrategy"; + if (!$item_type) $item_type="Dhtmlx\\Connector\\Data\\DataItem"; + if (!$data_type) $data_type="Dhtmlx\\Connector\\Data\\DataProcessor"; + if (!$render_type) $render_type="Dhtmlx\\Connector\\Output\\RenderStrategy"; $this->names=array( "db_class"=>$type, diff --git a/codebase/Dhtmlx/Connector/ConvertService.php b/codebase/Dhtmlx/Connector/ConvertService.php index 9fa3261..8c51289 100644 --- a/codebase/Dhtmlx/Connector/ConvertService.php +++ b/codebase/Dhtmlx/Connector/ConvertService.php @@ -1,8 +1,8 @@ <?php -namespace DHTMLX\Connector; +namespace Dhtmlx\Connector; -use DHTMLX\Connector\Tools\EventMaster; +use Dhtmlx\Connector\Tools\EventMaster; /* @author dhtmlx.com @license GPL, see license.txt diff --git a/codebase/Dhtmlx/Connector/Data/CommonDataItem.php b/codebase/Dhtmlx/Connector/Data/CommonDataItem.php index 523cd08..56bb817 100644 --- a/codebase/Dhtmlx/Connector/Data/CommonDataItem.php +++ b/codebase/Dhtmlx/Connector/Data/CommonDataItem.php @@ -1,6 +1,6 @@ <?php -namespace DHTMLX\Connector\Data; +namespace Dhtmlx\Connector\Data; /*! DataItem class for DataView component **/ class CommonDataItem extends DataItem{ diff --git a/codebase/Dhtmlx/Connector/Data/CommonDataProcessor.php b/codebase/Dhtmlx/Connector/Data/CommonDataProcessor.php index 8f00b94..bb64252 100644 --- a/codebase/Dhtmlx/Connector/Data/CommonDataProcessor.php +++ b/codebase/Dhtmlx/Connector/Data/CommonDataProcessor.php @@ -1,8 +1,8 @@ <?php -namespace DHTMLX\Connector\Data; +namespace Dhtmlx\Connector\Data; -use DHTMLX\Connector\XSSFilter\ConnectorSecurity; -use DHTMLX\Connector\Tools\LogMaster; +use Dhtmlx\Connector\XSSFilter\ConnectorSecurity; +use Dhtmlx\Connector\Tools\LogMaster; class CommonDataProcessor extends DataProcessor{ protected function get_post_values($ids){ diff --git a/codebase/Dhtmlx/Connector/Data/DataAction.php b/codebase/Dhtmlx/Connector/Data/DataAction.php index 8e4b5dd..cc136a6 100644 --- a/codebase/Dhtmlx/Connector/Data/DataAction.php +++ b/codebase/Dhtmlx/Connector/Data/DataAction.php @@ -1,7 +1,7 @@ <?php -namespace DHTMLX\Connector\Data; +namespace Dhtmlx\Connector\Data; -use DHTMLX\Connector\Tools\LogMaster; +use Dhtmlx\Connector\Tools\LogMaster; /*! contain all info related to action and controls customizaton **/ class DataAction{ diff --git a/codebase/Dhtmlx/Connector/Data/DataItem.php b/codebase/Dhtmlx/Connector/Data/DataItem.php index b980d9c..4b28300 100644 --- a/codebase/Dhtmlx/Connector/Data/DataItem.php +++ b/codebase/Dhtmlx/Connector/Data/DataItem.php @@ -1,6 +1,6 @@ <?php -namespace DHTMLX\Connector\Data; +namespace Dhtmlx\Connector\Data; /*! base class for component item representation **/ class DataItem{ diff --git a/codebase/Dhtmlx/Connector/Data/DataItemUpdate.php b/codebase/Dhtmlx/Connector/Data/DataItemUpdate.php index ad97be2..e1a8c21 100644 --- a/codebase/Dhtmlx/Connector/Data/DataItemUpdate.php +++ b/codebase/Dhtmlx/Connector/Data/DataItemUpdate.php @@ -11,7 +11,7 @@ Create wrapper for every data item with update information. */ -namespace DHTMLX\Connector\Data; +namespace Dhtmlx\Connector\Data; class DataItemUpdate extends DataItem { diff --git a/codebase/Dhtmlx/Connector/Data/DataProcessor.php b/codebase/Dhtmlx/Connector/Data/DataProcessor.php index 973753a..fa283d4 100644 --- a/codebase/Dhtmlx/Connector/Data/DataProcessor.php +++ b/codebase/Dhtmlx/Connector/Data/DataProcessor.php @@ -1,10 +1,10 @@ <?php /*! Base DataProcessor handling **/ -namespace DHTMLX\Connector\Data; -use DHTMLX\Connector\Tools\LogMaster; -use DHTMLX\Connector\XSSFilter\ConnectorSecurity; -use DHTMLX\Connector\DataStorage\DataConfig; +namespace Dhtmlx\Connector\Data; +use Dhtmlx\Connector\Tools\LogMaster; +use Dhtmlx\Connector\XSSFilter\ConnectorSecurity; +use Dhtmlx\Connector\DataStorage\DataConfig; class DataProcessor{ protected $connector;//!< Connector instance diff --git a/codebase/Dhtmlx/Connector/Data/GridDataProcessor.php b/codebase/Dhtmlx/Connector/Data/GridDataProcessor.php index 9b487eb..57126c8 100644 --- a/codebase/Dhtmlx/Connector/Data/GridDataProcessor.php +++ b/codebase/Dhtmlx/Connector/Data/GridDataProcessor.php @@ -1,5 +1,5 @@ <?php -namespace DHTMLX\Connector\Data; +namespace Dhtmlx\Connector\Data; /*! DataProcessor class for Grid component **/ diff --git a/codebase/Dhtmlx/Connector/Data/JSONCommonDataItem.php b/codebase/Dhtmlx/Connector/Data/JSONCommonDataItem.php index 4a69068..1ee8a07 100644 --- a/codebase/Dhtmlx/Connector/Data/JSONCommonDataItem.php +++ b/codebase/Dhtmlx/Connector/Data/JSONCommonDataItem.php @@ -1,5 +1,5 @@ <?php -namespace DHTMLX\Connector\Data; +namespace Dhtmlx\Connector\Data; class JSONCommonDataItem extends DataItem{ /*! return self as XML string diff --git a/codebase/Dhtmlx/Connector/Data/TreeDataItem.php b/codebase/Dhtmlx/Connector/Data/TreeDataItem.php index 561d495..3a7c840 100644 --- a/codebase/Dhtmlx/Connector/Data/TreeDataItem.php +++ b/codebase/Dhtmlx/Connector/Data/TreeDataItem.php @@ -1,6 +1,6 @@ <?php -namespace DHTMLX\Connector\Data; +namespace Dhtmlx\Connector\Data; class TreeDataItem extends DataItem { diff --git a/codebase/Dhtmlx/Connector/Data/TreeDataProcessor.php b/codebase/Dhtmlx/Connector/Data/TreeDataProcessor.php index dca6a8f..47d5a8b 100644 --- a/codebase/Dhtmlx/Connector/Data/TreeDataProcessor.php +++ b/codebase/Dhtmlx/Connector/Data/TreeDataProcessor.php @@ -1,5 +1,5 @@ <?php -namespace DHTMLX\Connector\Data; +namespace Dhtmlx\Connector\Data; class TreeDataProcessor extends DataProcessor{ diff --git a/codebase/Dhtmlx/Connector/DataConnector.php b/codebase/Dhtmlx/Connector/DataConnector.php index dc3498d..2b51c24 100644 --- a/codebase/Dhtmlx/Connector/DataConnector.php +++ b/codebase/Dhtmlx/Connector/DataConnector.php @@ -1,5 +1,5 @@ <?php -namespace DHTMLX\Connector; +namespace Dhtmlx\Connector; /*! Connector class for DataView **/ @@ -18,12 +18,12 @@ class DataConnector extends Connector{ name of class which will be used for dataprocessor calls handling, optional, DataProcessor class will be used by default. */ public function __construct($res,$type=false,$item_type=false,$data_type=false,$render_type=false){ - if (!$item_type) $item_type="DHTMLX\\Connector\\Data\\CommonDataItem"; - if (!$data_type) $data_type="DHTMLX\\Connector\\Data\\CommonDataProcessor"; + if (!$item_type) $item_type="Dhtmlx\\Connector\\Data\\CommonDataItem"; + if (!$data_type) $data_type="Dhtmlx\\Connector\\Data\\CommonDataProcessor"; $this->sections = array(); - if (!$render_type) $render_type="DHTMLX\\Connector\\Output\\RenderStrategy"; + if (!$render_type) $render_type="Dhtmlx\\Connector\\Output\\RenderStrategy"; parent::__construct($res,$type,$item_type,$data_type,$render_type); } diff --git a/codebase/Dhtmlx/Connector/DataStorage/ArrayDBDataWrapper.php b/codebase/Dhtmlx/Connector/DataStorage/ArrayDBDataWrapper.php index a806161..e5bbae9 100644 --- a/codebase/Dhtmlx/Connector/DataStorage/ArrayDBDataWrapper.php +++ b/codebase/Dhtmlx/Connector/DataStorage/ArrayDBDataWrapper.php @@ -1,6 +1,6 @@ <?php -namespace DHTMLX\Connector\DataStorage; +namespace Dhtmlx\Connector\DataStorage; class ArrayDBDataWrapper extends DBDataWrapper { diff --git a/codebase/Dhtmlx/Connector/DataStorage/ArrayQueryWrapper.php b/codebase/Dhtmlx/Connector/DataStorage/ArrayQueryWrapper.php index c922bd8..5fa079a 100644 --- a/codebase/Dhtmlx/Connector/DataStorage/ArrayQueryWrapper.php +++ b/codebase/Dhtmlx/Connector/DataStorage/ArrayQueryWrapper.php @@ -1,5 +1,5 @@ <?php -namespace DHTMLX\Connector\DataStorage; +namespace Dhtmlx\Connector\DataStorage; class ArrayQueryWrapper{ public function __construct($data){ diff --git a/codebase/Dhtmlx/Connector/DataStorage/DBDataWrapper.php b/codebase/Dhtmlx/Connector/DataStorage/DBDataWrapper.php index 1311866..bc93fee 100644 --- a/codebase/Dhtmlx/Connector/DataStorage/DBDataWrapper.php +++ b/codebase/Dhtmlx/Connector/DataStorage/DBDataWrapper.php @@ -6,7 +6,7 @@ * Time: 15.50 */ -namespace DHTMLX\Connector\DataStorage; +namespace Dhtmlx\Connector\DataStorage; abstract class DBDataWrapper extends DataWrapper { diff --git a/codebase/Dhtmlx/Connector/DataStorage/DataConfig.php b/codebase/Dhtmlx/Connector/DataStorage/DataConfig.php index c10fd2d..99af751 100644 --- a/codebase/Dhtmlx/Connector/DataStorage/DataConfig.php +++ b/codebase/Dhtmlx/Connector/DataStorage/DataConfig.php @@ -1,6 +1,6 @@ <?php -namespace DHTMLX\Connector\DataStorage; +namespace Dhtmlx\Connector\DataStorage; /*! manager of data configuration **/ class DataConfig{ diff --git a/codebase/Dhtmlx/Connector/DataStorage/DataRequestConfig.php b/codebase/Dhtmlx/Connector/DataStorage/DataRequestConfig.php index bb2c750..c9f3913 100644 --- a/codebase/Dhtmlx/Connector/DataStorage/DataRequestConfig.php +++ b/codebase/Dhtmlx/Connector/DataStorage/DataRequestConfig.php @@ -1,6 +1,6 @@ <?php -namespace DHTMLX\Connector\DataStorage; +namespace Dhtmlx\Connector\DataStorage; /*! manager of data request **/ diff --git a/codebase/Dhtmlx/Connector/DataStorage/DataWrapper.php b/codebase/Dhtmlx/Connector/DataStorage/DataWrapper.php index 19158cc..e6b706f 100644 --- a/codebase/Dhtmlx/Connector/DataStorage/DataWrapper.php +++ b/codebase/Dhtmlx/Connector/DataStorage/DataWrapper.php @@ -1,6 +1,6 @@ <?php -namespace DHTMLX\Connector\DataStorage; +namespace Dhtmlx\Connector\DataStorage; /*! Base abstraction class, used for data operations Class abstract access to data, it is a base class to all DB wrappers **/ diff --git a/codebase/Dhtmlx/Connector/DataStorage/MsSQLDBDataWrapper.php b/codebase/Dhtmlx/Connector/DataStorage/MsSQLDBDataWrapper.php index 1d245b2..048af60 100644 --- a/codebase/Dhtmlx/Connector/DataStorage/MsSQLDBDataWrapper.php +++ b/codebase/Dhtmlx/Connector/DataStorage/MsSQLDBDataWrapper.php @@ -1,8 +1,8 @@ <?php -namespace DHTMLX\Connector\DataStorage; +namespace Dhtmlx\Connector\DataStorage; -use DHTMLX\Connector\Tools\LogMaster; +use Dhtmlx\Connector\Tools\LogMaster; class MsSQLDBDataWrapper extends DBDataWrapper { diff --git a/codebase/Dhtmlx/Connector/DataStorage/MySQLDBDataWrapper.php b/codebase/Dhtmlx/Connector/DataStorage/MySQLDBDataWrapper.php index 3f13492..db68cbc 100644 --- a/codebase/Dhtmlx/Connector/DataStorage/MySQLDBDataWrapper.php +++ b/codebase/Dhtmlx/Connector/DataStorage/MySQLDBDataWrapper.php @@ -1,5 +1,5 @@ <?php -namespace DHTMLX\Connector\DataStorage; +namespace Dhtmlx\Connector\DataStorage; /*! Implementation of DataWrapper for MySQL diff --git a/codebase/Dhtmlx/Connector/DataStorage/PDODBDataWrapper.php b/codebase/Dhtmlx/Connector/DataStorage/PDODBDataWrapper.php index 5a08e57..dce146b 100644 --- a/codebase/Dhtmlx/Connector/DataStorage/PDODBDataWrapper.php +++ b/codebase/Dhtmlx/Connector/DataStorage/PDODBDataWrapper.php @@ -1,6 +1,6 @@ <?php -namespace DHTMLX\Connector\DataStorage; +namespace Dhtmlx\Connector\DataStorage; /*! Implementation of DataWrapper for PDO diff --git a/codebase/Dhtmlx/Connector/DataStorage/PDOResultSet.php b/codebase/Dhtmlx/Connector/DataStorage/PDOResultSet.php index 536f75c..1221d05 100644 --- a/codebase/Dhtmlx/Connector/DataStorage/PDOResultSet.php +++ b/codebase/Dhtmlx/Connector/DataStorage/PDOResultSet.php @@ -1,6 +1,6 @@ <?php -namespace DHTMLX\Connector\DataStorage; +namespace Dhtmlx\Connector\DataStorage; class PDOResultSet{ private $res; diff --git a/codebase/Dhtmlx/Connector/DataStorage/PHPYii1DBDataWrapper.php b/codebase/Dhtmlx/Connector/DataStorage/PHPYii1DBDataWrapper.php index db0f100..d585ac2 100644 --- a/codebase/Dhtmlx/Connector/DataStorage/PHPYii1DBDataWrapper.php +++ b/codebase/Dhtmlx/Connector/DataStorage/PHPYii1DBDataWrapper.php @@ -1,5 +1,5 @@ <?php -namespace DHTMLX\Connector\DataStorage; +namespace Dhtmlx\Connector\DataStorage; class PHPYii1DBDataWrapper extends ArrayDBDataWrapper { diff --git a/codebase/Dhtmlx/Connector/DataStorage/PHPYiiDBDataWrapper.php b/codebase/Dhtmlx/Connector/DataStorage/PHPYiiDBDataWrapper.php index 57fb94a..6a02d11 100644 --- a/codebase/Dhtmlx/Connector/DataStorage/PHPYiiDBDataWrapper.php +++ b/codebase/Dhtmlx/Connector/DataStorage/PHPYiiDBDataWrapper.php @@ -1,5 +1,5 @@ <?php -namespace DHTMLX\Connector\DataStorage; +namespace Dhtmlx\Connector\DataStorage; class PHPYiiDBDataWrapper extends ArrayDBDataWrapper { diff --git a/codebase/Dhtmlx/Connector/DataStorage/PostgreDBDataWrapper.php b/codebase/Dhtmlx/Connector/DataStorage/PostgreDBDataWrapper.php index 56eaa48..ef5b92d 100644 --- a/codebase/Dhtmlx/Connector/DataStorage/PostgreDBDataWrapper.php +++ b/codebase/Dhtmlx/Connector/DataStorage/PostgreDBDataWrapper.php @@ -1,8 +1,8 @@ <?php -namespace DHTMLX\Connector\DataStorage; +namespace Dhtmlx\Connector\DataStorage; -use DHTMLX\Connector\Tools\LogMaster; +use Dhtmlx\Connector\Tools\LogMaster; class PostgreDBDataWrapper extends DBDataWrapper{ public function query($sql){ diff --git a/codebase/Dhtmlx/Connector/DistinctOptionsConnector.php b/codebase/Dhtmlx/Connector/DistinctOptionsConnector.php index 273ec6b..a2e794c 100644 --- a/codebase/Dhtmlx/Connector/DistinctOptionsConnector.php +++ b/codebase/Dhtmlx/Connector/DistinctOptionsConnector.php @@ -1,5 +1,5 @@ <?php -namespace DHTMLX\Connector; +namespace Dhtmlx\Connector; class DistinctOptionsConnector extends OptionsConnector{ /*! render self diff --git a/codebase/Dhtmlx/Connector/Event/EventInterface.php b/codebase/Dhtmlx/Connector/Event/EventInterface.php index 645d89b..b2503fe 100644 --- a/codebase/Dhtmlx/Connector/Event/EventInterface.php +++ b/codebase/Dhtmlx/Connector/Event/EventInterface.php @@ -1,5 +1,5 @@ <?php -namespace DHTMLX\Connector\Event; +namespace Dhtmlx\Connector\Event; class EventInterface{ protected $request; ////!< DataRequestConfig instance diff --git a/codebase/Dhtmlx/Connector/Event/FilterInterface.php b/codebase/Dhtmlx/Connector/Event/FilterInterface.php index e37489d..5be8516 100644 --- a/codebase/Dhtmlx/Connector/Event/FilterInterface.php +++ b/codebase/Dhtmlx/Connector/Event/FilterInterface.php @@ -1,6 +1,6 @@ <?php -namespace DHTMLX\Connector\Event; +namespace Dhtmlx\Connector\Event; /*! Wrapper for collection of filtering rules **/ diff --git a/codebase/Dhtmlx/Connector/Event/SortInterface.php b/codebase/Dhtmlx/Connector/Event/SortInterface.php index 5e6aef4..f2090eb 100644 --- a/codebase/Dhtmlx/Connector/Event/SortInterface.php +++ b/codebase/Dhtmlx/Connector/Event/SortInterface.php @@ -1,6 +1,6 @@ <?php -namespace DHTMLX\Connector\Event; +namespace Dhtmlx\Connector\Event; class SortInterface extends EventInterface{ /*! constructor diff --git a/codebase/Dhtmlx/Connector/GridConfiguration.php b/codebase/Dhtmlx/Connector/GridConfiguration.php index d67a0b6..094d374 100644 --- a/codebase/Dhtmlx/Connector/GridConfiguration.php +++ b/codebase/Dhtmlx/Connector/GridConfiguration.php @@ -1,5 +1,5 @@ <?php -namespace DHTMLX\Connector; +namespace Dhtmlx\Connector; class GridConfiguration { diff --git a/codebase/Dhtmlx/Connector/GridConnector.php b/codebase/Dhtmlx/Connector/GridConnector.php index b25a95a..d912f4f 100644 --- a/codebase/Dhtmlx/Connector/GridConnector.php +++ b/codebase/Dhtmlx/Connector/GridConnector.php @@ -1,6 +1,6 @@ <?php -namespace DHTMLX\Connector; +namespace Dhtmlx\Connector; /*! Connector for the dhtmlxgrid **/ class GridConnector extends Connector{ @@ -18,9 +18,9 @@ class GridConnector extends Connector{ name of class which will be used for dataprocessor calls handling, optional, DataProcessor class will be used by default. */ public function __construct($res,$type=false,$item_type=false,$data_type=false,$render_type=false){ - if (!$item_type) $item_type="DHTMLX\\Connector\\GridDataItem"; - if (!$data_type) $data_type="DHTMLX\\Connector\\Data\\GridDataProcessor"; - if (!$render_type) $render_type="DHTMLX\\Connector\\Output\\RenderStrategy"; + if (!$item_type) $item_type="Dhtmlx\\Connector\\GridDataItem"; + if (!$data_type) $data_type="Dhtmlx\\Connector\\Data\\GridDataProcessor"; + if (!$render_type) $render_type="Dhtmlx\\Connector\\Output\\RenderStrategy"; parent::__construct($res,$type,$item_type,$data_type,$render_type); } diff --git a/codebase/Dhtmlx/Connector/GridDataItem.php b/codebase/Dhtmlx/Connector/GridDataItem.php index a405f8b..29db286 100644 --- a/codebase/Dhtmlx/Connector/GridDataItem.php +++ b/codebase/Dhtmlx/Connector/GridDataItem.php @@ -1,8 +1,8 @@ <?php -namespace DHTMLX\Connector; +namespace Dhtmlx\Connector; -use DHTMLX\Connector\Data\DataItem; +use Dhtmlx\Connector\Data\DataItem; /*! DataItem class for Grid component **/ diff --git a/codebase/Dhtmlx/Connector/JSONDataConnector.php b/codebase/Dhtmlx/Connector/JSONDataConnector.php index fd6b3a0..90581f3 100644 --- a/codebase/Dhtmlx/Connector/JSONDataConnector.php +++ b/codebase/Dhtmlx/Connector/JSONDataConnector.php @@ -1,16 +1,16 @@ <?php -namespace DHTMLX\Connector; +namespace Dhtmlx\Connector; -use DHTMLX\Connector\Output\OutputWriter; +use Dhtmlx\Connector\Output\OutputWriter; class JSONDataConnector extends DataConnector{ public function __construct($res,$type=false,$item_type=false,$data_type=false,$render_type=false){ - if (!$item_type) $item_type="DHTMLX\\Connector\\Data\\JSONCommonDataItem"; - if (!$data_type) $data_type="DHTMLX\\Connector\\Data\\CommonDataProcessor"; - if (!$render_type) $render_type="DHTMLX\\Connector\\Output\\JSONRenderStrategy"; + if (!$item_type) $item_type="Dhtmlx\\Connector\\Data\\JSONCommonDataItem"; + if (!$data_type) $data_type="Dhtmlx\\Connector\\Data\\CommonDataProcessor"; + if (!$render_type) $render_type="Dhtmlx\\Connector\\Output\\JSONRenderStrategy"; $this->data_separator = ",\n"; parent::__construct($res,$type,$item_type,$data_type,$render_type); } diff --git a/codebase/Dhtmlx/Connector/JSONOptionsConnector.php b/codebase/Dhtmlx/Connector/JSONOptionsConnector.php index 6d25354..1a1b600 100644 --- a/codebase/Dhtmlx/Connector/JSONOptionsConnector.php +++ b/codebase/Dhtmlx/Connector/JSONOptionsConnector.php @@ -1,6 +1,6 @@ <?php -namespace DHTMLX\Connector; +namespace Dhtmlx\Connector; /*! wrapper around options collection, used for comboboxes and filters **/ class JSONOptionsConnector extends JSONDataConnector{ diff --git a/codebase/Dhtmlx/Connector/MixedConnector.php b/codebase/Dhtmlx/Connector/MixedConnector.php index 898bfa9..8912599 100644 --- a/codebase/Dhtmlx/Connector/MixedConnector.php +++ b/codebase/Dhtmlx/Connector/MixedConnector.php @@ -1,7 +1,7 @@ <?php -namespace DHTMLX\Connector; +namespace Dhtmlx\Connector; -use DHTMLX\Connector\Connector; +use Dhtmlx\Connector\Connector; class MixedConnector extends Connector { diff --git a/codebase/Dhtmlx/Connector/OptionsConnector.php b/codebase/Dhtmlx/Connector/OptionsConnector.php index 4c0ab16..35b81b0 100644 --- a/codebase/Dhtmlx/Connector/OptionsConnector.php +++ b/codebase/Dhtmlx/Connector/OptionsConnector.php @@ -1,6 +1,6 @@ <?php -namespace DHTMLX\Connector; +namespace Dhtmlx\Connector; /*! wrapper around options collection, used for comboboxes and filters **/ diff --git a/codebase/Dhtmlx/Connector/Output/JSONRenderStrategy.php b/codebase/Dhtmlx/Connector/Output/JSONRenderStrategy.php index fddfd3d..b351f2e 100644 --- a/codebase/Dhtmlx/Connector/Output/JSONRenderStrategy.php +++ b/codebase/Dhtmlx/Connector/Output/JSONRenderStrategy.php @@ -1,6 +1,6 @@ <?php -namespace DHTMLX\Connector\Output; +namespace Dhtmlx\Connector\Output; class JSONRenderStrategy extends RenderStrategy { diff --git a/codebase/Dhtmlx/Connector/Output/JSONTreeRenderStrategy.php b/codebase/Dhtmlx/Connector/Output/JSONTreeRenderStrategy.php index 04a8672..c3edd79 100644 --- a/codebase/Dhtmlx/Connector/Output/JSONTreeRenderStrategy.php +++ b/codebase/Dhtmlx/Connector/Output/JSONTreeRenderStrategy.php @@ -1,5 +1,5 @@ <?php -namespace DHTMLX\Connector\Output; +namespace Dhtmlx\Connector\Output; class JSONTreeRenderStrategy extends TreeRenderStrategy { diff --git a/codebase/Dhtmlx/Connector/Output/OutputWriter.php b/codebase/Dhtmlx/Connector/Output/OutputWriter.php index 96bb49a..9f93cf3 100644 --- a/codebase/Dhtmlx/Connector/Output/OutputWriter.php +++ b/codebase/Dhtmlx/Connector/Output/OutputWriter.php @@ -1,6 +1,6 @@ <?php -namespace DHTMLX\Connector\Output; +namespace Dhtmlx\Connector\Output; class OutputWriter{ private $start; diff --git a/codebase/Dhtmlx/Connector/Output/RenderStrategy.php b/codebase/Dhtmlx/Connector/Output/RenderStrategy.php index 9431d0d..07ed39e 100644 --- a/codebase/Dhtmlx/Connector/Output/RenderStrategy.php +++ b/codebase/Dhtmlx/Connector/Output/RenderStrategy.php @@ -1,8 +1,8 @@ <?php -namespace DHTMLX\Connector\Output; +namespace Dhtmlx\Connector\Output; -use DHTMLX\Connector\Data\DataItem; -use DHTMLX\Connector\GridDataItem; +use Dhtmlx\Connector\Data\DataItem; +use Dhtmlx\Connector\GridDataItem; class RenderStrategy { protected $conn = null; diff --git a/codebase/Dhtmlx/Connector/Output/TreeRenderStrategy.php b/codebase/Dhtmlx/Connector/Output/TreeRenderStrategy.php index d66e58e..b5ab642 100644 --- a/codebase/Dhtmlx/Connector/Output/TreeRenderStrategy.php +++ b/codebase/Dhtmlx/Connector/Output/TreeRenderStrategy.php @@ -1,7 +1,7 @@ <?php -namespace DHTMLX\Connector\Output; +namespace Dhtmlx\Connector\Output; -use DHTMLX\Connector\DataStorage\DataConfig; +use Dhtmlx\Connector\DataStorage\DataConfig; class TreeRenderStrategy extends RenderStrategy { diff --git a/codebase/Dhtmlx/Connector/Tools/AccessMaster.php b/codebase/Dhtmlx/Connector/Tools/AccessMaster.php index 6c84e20..ce47c6f 100644 --- a/codebase/Dhtmlx/Connector/Tools/AccessMaster.php +++ b/codebase/Dhtmlx/Connector/Tools/AccessMaster.php @@ -1,5 +1,5 @@ <?php -namespace DHTMLX\Connector\Tools; +namespace Dhtmlx\Connector\Tools; /*! Class which handles access rules. **/ class AccessMaster{ diff --git a/codebase/Dhtmlx/Connector/Tools/EventMaster.php b/codebase/Dhtmlx/Connector/Tools/EventMaster.php index ec849d8..d4c6c50 100644 --- a/codebase/Dhtmlx/Connector/Tools/EventMaster.php +++ b/codebase/Dhtmlx/Connector/Tools/EventMaster.php @@ -1,6 +1,6 @@ <?php -namespace DHTMLX\Connector\Tools; +namespace Dhtmlx\Connector\Tools; /*! Class which allows to assign|fire events. */ class EventMaster{ diff --git a/codebase/Dhtmlx/Connector/Tools/LogMaster.php b/codebase/Dhtmlx/Connector/Tools/LogMaster.php index 657516d..da4dd69 100755 --- a/codebase/Dhtmlx/Connector/Tools/LogMaster.php +++ b/codebase/Dhtmlx/Connector/Tools/LogMaster.php @@ -1,6 +1,6 @@ <?php -namespace DHTMLX\Connector\Tools; +namespace Dhtmlx\Connector\Tools; /*! Controls error and debug logging. Class designed to be used as static object. **/ @@ -93,8 +93,8 @@ class LogMaster{ LogMaster::$_log=$name; LogMaster::$_output=$output; if ($name){ - set_error_handler(array("DHTMLX\\Connector\\Tools\\LogMaster","error_log"),E_ALL); - set_exception_handler(array("DHTMLX\\Connector\\Tools\\LogMaster","exception_log")); + set_error_handler(array("Dhtmlx\\Connector\\Tools\\LogMaster","error_log"),E_ALL); + set_exception_handler(array("Dhtmlx\\Connector\\Tools\\LogMaster","exception_log")); LogMaster::log("\n\n====================================\nLog started, ".date("d/m/Y h:i:s")."\n===================================="); } } diff --git a/codebase/Dhtmlx/Connector/TreeConnector.php b/codebase/Dhtmlx/Connector/TreeConnector.php index b01e399..9788e54 100644 --- a/codebase/Dhtmlx/Connector/TreeConnector.php +++ b/codebase/Dhtmlx/Connector/TreeConnector.php @@ -1,6 +1,6 @@ <?php -namespace DHTMLX\Connector; +namespace Dhtmlx\Connector; class TreeConnector extends Connector { diff --git a/codebase/Dhtmlx/Connector/XSSFilter/ConnectorSecurity.php b/codebase/Dhtmlx/Connector/XSSFilter/ConnectorSecurity.php index 195e962..582ea0a 100644 --- a/codebase/Dhtmlx/Connector/XSSFilter/ConnectorSecurity.php +++ b/codebase/Dhtmlx/Connector/XSSFilter/ConnectorSecurity.php @@ -1,8 +1,8 @@ <?php -namespace DHTMLX\Connector\XSSFilter; +namespace Dhtmlx\Connector\XSSFilter; -use DHTMLX\Connector\Tools\LogMaster; +use Dhtmlx\Connector\Tools\LogMaster; define("DHX_SECURITY_SAFETEXT", 1); define("DHX_SECURITY_SAFEHTML", 2); diff --git a/codebase/Dhtmlx/Connector/XSSFilter/dhxExternalInputClean.php b/codebase/Dhtmlx/Connector/XSSFilter/dhxExternalInputClean.php index 4f3b526..4ba7525 100644 --- a/codebase/Dhtmlx/Connector/XSSFilter/dhxExternalInputClean.php +++ b/codebase/Dhtmlx/Connector/XSSFilter/dhxExternalInputClean.php @@ -1,5 +1,5 @@ <?php -namespace DHTMLX\Connector\XSSFilter; +namespace Dhtmlx\Connector\XSSFilter; //original name was lx_externalinput_clean //renamed to prevent possible conflicts class dhxExternalInputClean { diff --git a/composer.json b/composer.json index 3648a95..868813d 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ }, "autoload": { "psr-0": { - "DHTMLX\\Connector\\": "codebase/" + "Dhtmlx\\Connector\\": "codebase/" } }, "min-stability": "dev", |