diff --git a/phpxpress/bootstrap-5.1.3-dist/css/bootstrap-grid.css b/bootstrap-5.1.3-dist/css/bootstrap-grid.css similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/css/bootstrap-grid.css rename to bootstrap-5.1.3-dist/css/bootstrap-grid.css diff --git a/phpxpress/bootstrap-5.1.3-dist/css/bootstrap-grid.css.map b/bootstrap-5.1.3-dist/css/bootstrap-grid.css.map similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/css/bootstrap-grid.css.map rename to bootstrap-5.1.3-dist/css/bootstrap-grid.css.map diff --git a/phpxpress/bootstrap-5.1.3-dist/css/bootstrap-grid.min.css b/bootstrap-5.1.3-dist/css/bootstrap-grid.min.css similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/css/bootstrap-grid.min.css rename to bootstrap-5.1.3-dist/css/bootstrap-grid.min.css diff --git a/phpxpress/bootstrap-5.1.3-dist/css/bootstrap-grid.min.css.map b/bootstrap-5.1.3-dist/css/bootstrap-grid.min.css.map similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/css/bootstrap-grid.min.css.map rename to bootstrap-5.1.3-dist/css/bootstrap-grid.min.css.map diff --git a/phpxpress/bootstrap-5.1.3-dist/css/bootstrap-grid.rtl.css b/bootstrap-5.1.3-dist/css/bootstrap-grid.rtl.css similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/css/bootstrap-grid.rtl.css rename to bootstrap-5.1.3-dist/css/bootstrap-grid.rtl.css diff --git a/phpxpress/bootstrap-5.1.3-dist/css/bootstrap-grid.rtl.css.map b/bootstrap-5.1.3-dist/css/bootstrap-grid.rtl.css.map similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/css/bootstrap-grid.rtl.css.map rename to bootstrap-5.1.3-dist/css/bootstrap-grid.rtl.css.map diff --git a/phpxpress/bootstrap-5.1.3-dist/css/bootstrap-grid.rtl.min.css b/bootstrap-5.1.3-dist/css/bootstrap-grid.rtl.min.css similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/css/bootstrap-grid.rtl.min.css rename to bootstrap-5.1.3-dist/css/bootstrap-grid.rtl.min.css diff --git a/phpxpress/bootstrap-5.1.3-dist/css/bootstrap-grid.rtl.min.css.map b/bootstrap-5.1.3-dist/css/bootstrap-grid.rtl.min.css.map similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/css/bootstrap-grid.rtl.min.css.map rename to bootstrap-5.1.3-dist/css/bootstrap-grid.rtl.min.css.map diff --git a/phpxpress/bootstrap-5.1.3-dist/css/bootstrap-reboot.css b/bootstrap-5.1.3-dist/css/bootstrap-reboot.css similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/css/bootstrap-reboot.css rename to bootstrap-5.1.3-dist/css/bootstrap-reboot.css diff --git a/phpxpress/bootstrap-5.1.3-dist/css/bootstrap-reboot.css.map b/bootstrap-5.1.3-dist/css/bootstrap-reboot.css.map similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/css/bootstrap-reboot.css.map rename to bootstrap-5.1.3-dist/css/bootstrap-reboot.css.map diff --git a/phpxpress/bootstrap-5.1.3-dist/css/bootstrap-reboot.min.css b/bootstrap-5.1.3-dist/css/bootstrap-reboot.min.css similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/css/bootstrap-reboot.min.css rename to bootstrap-5.1.3-dist/css/bootstrap-reboot.min.css diff --git a/phpxpress/bootstrap-5.1.3-dist/css/bootstrap-reboot.min.css.map b/bootstrap-5.1.3-dist/css/bootstrap-reboot.min.css.map similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/css/bootstrap-reboot.min.css.map rename to bootstrap-5.1.3-dist/css/bootstrap-reboot.min.css.map diff --git a/phpxpress/bootstrap-5.1.3-dist/css/bootstrap-reboot.rtl.css b/bootstrap-5.1.3-dist/css/bootstrap-reboot.rtl.css similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/css/bootstrap-reboot.rtl.css rename to bootstrap-5.1.3-dist/css/bootstrap-reboot.rtl.css diff --git a/phpxpress/bootstrap-5.1.3-dist/css/bootstrap-reboot.rtl.css.map b/bootstrap-5.1.3-dist/css/bootstrap-reboot.rtl.css.map similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/css/bootstrap-reboot.rtl.css.map rename to bootstrap-5.1.3-dist/css/bootstrap-reboot.rtl.css.map diff --git a/phpxpress/bootstrap-5.1.3-dist/css/bootstrap-reboot.rtl.min.css b/bootstrap-5.1.3-dist/css/bootstrap-reboot.rtl.min.css similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/css/bootstrap-reboot.rtl.min.css rename to bootstrap-5.1.3-dist/css/bootstrap-reboot.rtl.min.css diff --git a/phpxpress/bootstrap-5.1.3-dist/css/bootstrap-reboot.rtl.min.css.map b/bootstrap-5.1.3-dist/css/bootstrap-reboot.rtl.min.css.map similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/css/bootstrap-reboot.rtl.min.css.map rename to bootstrap-5.1.3-dist/css/bootstrap-reboot.rtl.min.css.map diff --git a/phpxpress/bootstrap-5.1.3-dist/css/bootstrap-utilities.css b/bootstrap-5.1.3-dist/css/bootstrap-utilities.css similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/css/bootstrap-utilities.css rename to bootstrap-5.1.3-dist/css/bootstrap-utilities.css diff --git a/phpxpress/bootstrap-5.1.3-dist/css/bootstrap-utilities.css.map b/bootstrap-5.1.3-dist/css/bootstrap-utilities.css.map similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/css/bootstrap-utilities.css.map rename to bootstrap-5.1.3-dist/css/bootstrap-utilities.css.map diff --git a/phpxpress/bootstrap-5.1.3-dist/css/bootstrap-utilities.min.css b/bootstrap-5.1.3-dist/css/bootstrap-utilities.min.css similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/css/bootstrap-utilities.min.css rename to bootstrap-5.1.3-dist/css/bootstrap-utilities.min.css diff --git a/phpxpress/bootstrap-5.1.3-dist/css/bootstrap-utilities.min.css.map b/bootstrap-5.1.3-dist/css/bootstrap-utilities.min.css.map similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/css/bootstrap-utilities.min.css.map rename to bootstrap-5.1.3-dist/css/bootstrap-utilities.min.css.map diff --git a/phpxpress/bootstrap-5.1.3-dist/css/bootstrap-utilities.rtl.css b/bootstrap-5.1.3-dist/css/bootstrap-utilities.rtl.css similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/css/bootstrap-utilities.rtl.css rename to bootstrap-5.1.3-dist/css/bootstrap-utilities.rtl.css diff --git a/phpxpress/bootstrap-5.1.3-dist/css/bootstrap-utilities.rtl.css.map b/bootstrap-5.1.3-dist/css/bootstrap-utilities.rtl.css.map similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/css/bootstrap-utilities.rtl.css.map rename to bootstrap-5.1.3-dist/css/bootstrap-utilities.rtl.css.map diff --git a/phpxpress/bootstrap-5.1.3-dist/css/bootstrap-utilities.rtl.min.css b/bootstrap-5.1.3-dist/css/bootstrap-utilities.rtl.min.css similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/css/bootstrap-utilities.rtl.min.css rename to bootstrap-5.1.3-dist/css/bootstrap-utilities.rtl.min.css diff --git a/phpxpress/bootstrap-5.1.3-dist/css/bootstrap-utilities.rtl.min.css.map b/bootstrap-5.1.3-dist/css/bootstrap-utilities.rtl.min.css.map similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/css/bootstrap-utilities.rtl.min.css.map rename to bootstrap-5.1.3-dist/css/bootstrap-utilities.rtl.min.css.map diff --git a/phpxpress/bootstrap-5.1.3-dist/css/bootstrap.css b/bootstrap-5.1.3-dist/css/bootstrap.css similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/css/bootstrap.css rename to bootstrap-5.1.3-dist/css/bootstrap.css diff --git a/phpxpress/bootstrap-5.1.3-dist/css/bootstrap.css.map b/bootstrap-5.1.3-dist/css/bootstrap.css.map similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/css/bootstrap.css.map rename to bootstrap-5.1.3-dist/css/bootstrap.css.map diff --git a/phpxpress/bootstrap-5.1.3-dist/css/bootstrap.min.css b/bootstrap-5.1.3-dist/css/bootstrap.min.css similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/css/bootstrap.min.css rename to bootstrap-5.1.3-dist/css/bootstrap.min.css diff --git a/phpxpress/bootstrap-5.1.3-dist/css/bootstrap.min.css.map b/bootstrap-5.1.3-dist/css/bootstrap.min.css.map similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/css/bootstrap.min.css.map rename to bootstrap-5.1.3-dist/css/bootstrap.min.css.map diff --git a/phpxpress/bootstrap-5.1.3-dist/css/bootstrap.rtl.css b/bootstrap-5.1.3-dist/css/bootstrap.rtl.css similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/css/bootstrap.rtl.css rename to bootstrap-5.1.3-dist/css/bootstrap.rtl.css diff --git a/phpxpress/bootstrap-5.1.3-dist/css/bootstrap.rtl.css.map b/bootstrap-5.1.3-dist/css/bootstrap.rtl.css.map similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/css/bootstrap.rtl.css.map rename to bootstrap-5.1.3-dist/css/bootstrap.rtl.css.map diff --git a/phpxpress/bootstrap-5.1.3-dist/css/bootstrap.rtl.min.css b/bootstrap-5.1.3-dist/css/bootstrap.rtl.min.css similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/css/bootstrap.rtl.min.css rename to bootstrap-5.1.3-dist/css/bootstrap.rtl.min.css diff --git a/phpxpress/bootstrap-5.1.3-dist/css/bootstrap.rtl.min.css.map b/bootstrap-5.1.3-dist/css/bootstrap.rtl.min.css.map similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/css/bootstrap.rtl.min.css.map rename to bootstrap-5.1.3-dist/css/bootstrap.rtl.min.css.map diff --git a/phpxpress/bootstrap-5.1.3-dist/js/bootstrap.bundle.js b/bootstrap-5.1.3-dist/js/bootstrap.bundle.js similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/js/bootstrap.bundle.js rename to bootstrap-5.1.3-dist/js/bootstrap.bundle.js diff --git a/phpxpress/bootstrap-5.1.3-dist/js/bootstrap.bundle.js.map b/bootstrap-5.1.3-dist/js/bootstrap.bundle.js.map similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/js/bootstrap.bundle.js.map rename to bootstrap-5.1.3-dist/js/bootstrap.bundle.js.map diff --git a/phpxpress/bootstrap-5.1.3-dist/js/bootstrap.bundle.min.js b/bootstrap-5.1.3-dist/js/bootstrap.bundle.min.js similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/js/bootstrap.bundle.min.js rename to bootstrap-5.1.3-dist/js/bootstrap.bundle.min.js diff --git a/phpxpress/bootstrap-5.1.3-dist/js/bootstrap.bundle.min.js.map b/bootstrap-5.1.3-dist/js/bootstrap.bundle.min.js.map similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/js/bootstrap.bundle.min.js.map rename to bootstrap-5.1.3-dist/js/bootstrap.bundle.min.js.map diff --git a/phpxpress/bootstrap-5.1.3-dist/js/bootstrap.esm.js b/bootstrap-5.1.3-dist/js/bootstrap.esm.js similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/js/bootstrap.esm.js rename to bootstrap-5.1.3-dist/js/bootstrap.esm.js diff --git a/phpxpress/bootstrap-5.1.3-dist/js/bootstrap.esm.js.map b/bootstrap-5.1.3-dist/js/bootstrap.esm.js.map similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/js/bootstrap.esm.js.map rename to bootstrap-5.1.3-dist/js/bootstrap.esm.js.map diff --git a/phpxpress/bootstrap-5.1.3-dist/js/bootstrap.esm.min.js b/bootstrap-5.1.3-dist/js/bootstrap.esm.min.js similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/js/bootstrap.esm.min.js rename to bootstrap-5.1.3-dist/js/bootstrap.esm.min.js diff --git a/phpxpress/bootstrap-5.1.3-dist/js/bootstrap.esm.min.js.map b/bootstrap-5.1.3-dist/js/bootstrap.esm.min.js.map similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/js/bootstrap.esm.min.js.map rename to bootstrap-5.1.3-dist/js/bootstrap.esm.min.js.map diff --git a/phpxpress/bootstrap-5.1.3-dist/js/bootstrap.js b/bootstrap-5.1.3-dist/js/bootstrap.js similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/js/bootstrap.js rename to bootstrap-5.1.3-dist/js/bootstrap.js diff --git a/phpxpress/bootstrap-5.1.3-dist/js/bootstrap.js.map b/bootstrap-5.1.3-dist/js/bootstrap.js.map similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/js/bootstrap.js.map rename to bootstrap-5.1.3-dist/js/bootstrap.js.map diff --git a/phpxpress/bootstrap-5.1.3-dist/js/bootstrap.min.js b/bootstrap-5.1.3-dist/js/bootstrap.min.js similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/js/bootstrap.min.js rename to bootstrap-5.1.3-dist/js/bootstrap.min.js diff --git a/phpxpress/bootstrap-5.1.3-dist/js/bootstrap.min.js.map b/bootstrap-5.1.3-dist/js/bootstrap.min.js.map similarity index 100% rename from phpxpress/bootstrap-5.1.3-dist/js/bootstrap.min.js.map rename to bootstrap-5.1.3-dist/js/bootstrap.min.js.map diff --git a/phpxpress/examples/breadcrumb.php b/examples/breadcrumb.php similarity index 74% rename from phpxpress/examples/breadcrumb.php rename to examples/breadcrumb.php index afa338d..db17266 100644 --- a/phpxpress/examples/breadcrumb.php +++ b/examples/breadcrumb.php @@ -1,21 +1,21 @@ - Card example + BreadCrumb example setDataSource($links); $breadcrumb->draw(); ?> - \ No newline at end of file + diff --git a/phpxpress/examples/card.php b/examples/card.php similarity index 90% rename from phpxpress/examples/card.php rename to examples/card.php index 6972270..5bde096 100644 --- a/phpxpress/examples/card.php +++ b/examples/card.php @@ -5,13 +5,13 @@ setImageSource("./images/colosseum.jpg"); $card1->setTitle("Rome"); $card1->setSubTitle("Capital of Italy"); @@ -39,7 +39,7 @@ $paris->Inhabitants = "2.229.095"; $paris->Zip = "750XX"; - $card2 = new Card; + $card2 = new PhpXpress\Card; $card2->setImageSource("./images/paris.jpg"); $card2->setTitle("Paris"); $card2->setSubTitle("Capital of France"); @@ -55,7 +55,7 @@ $card2->draw(); - Card::endCardGroupLayout(); + PhpXpress\Card::endCardGroupLayout(); function onFieldDisplaying(&$field , &$value){ if($field == "Inhabitants"){ @@ -64,4 +64,4 @@ } ?> - \ No newline at end of file + diff --git a/phpxpress/examples/dropdown.php b/examples/dropdown.php similarity index 65% rename from phpxpress/examples/dropdown.php rename to examples/dropdown.php index 4dcb459..ce66065 100644 --- a/phpxpress/examples/dropdown.php +++ b/examples/dropdown.php @@ -1,17 +1,19 @@ + Dropdown example setTitle("Bank Account"); $dropdown->setDataSource(array("Unicredit" => "#" , "United Bank" => "#" , "National Bank" => "#")); $dropdown->draw(); ?> - \ No newline at end of file + diff --git a/phpxpress/examples/images/breadcrumb.jpg b/examples/images/breadcrumb.jpg similarity index 100% rename from phpxpress/examples/images/breadcrumb.jpg rename to examples/images/breadcrumb.jpg diff --git a/phpxpress/examples/images/card.jpg b/examples/images/card.jpg similarity index 100% rename from phpxpress/examples/images/card.jpg rename to examples/images/card.jpg diff --git a/phpxpress/examples/images/colosseum.jpg b/examples/images/colosseum.jpg similarity index 100% rename from phpxpress/examples/images/colosseum.jpg rename to examples/images/colosseum.jpg diff --git a/phpxpress/examples/images/demoTable.jpg b/examples/images/demoTable.jpg similarity index 100% rename from phpxpress/examples/images/demoTable.jpg rename to examples/images/demoTable.jpg diff --git a/phpxpress/examples/images/paris.jpg b/examples/images/paris.jpg similarity index 100% rename from phpxpress/examples/images/paris.jpg rename to examples/images/paris.jpg diff --git a/phpxpress/examples/table.php b/examples/table.php similarity index 92% rename from phpxpress/examples/table.php rename to examples/table.php index 04ad2de..891347c 100644 --- a/phpxpress/examples/table.php +++ b/examples/table.php @@ -5,7 +5,7 @@ surname = 'Johnstone'; $employee2->dateOfBirth = "02-04-1988"; $employee2->ssn = "56789"; - + $employee3->name = 'Anna'; $employee3->surname = 'Brenson'; $employee3->dateOfBirth = "10-08-1998"; @@ -35,12 +35,12 @@ $employees = array($employee1,$employee2,$employee3); - $table = new Table; + $table = new PhpXpress\Table; $table->addColumn("Extra"); $table->setDataSource($employees); $table->setCustomCaptions(array("Extra" , "Name", "Surname", "Date of Birth", "Social Security Number")); $table->addColumn("Extra2"); - + $table->onValueDisplaying("onValueDisplaying"); @@ -66,4 +66,4 @@ ?> - \ No newline at end of file + diff --git a/phpxpress/phpxpress/breadcrumb.php b/phpxpress/Breadcrumb.php similarity index 94% rename from phpxpress/phpxpress/breadcrumb.php rename to phpxpress/Breadcrumb.php index aba97f7..2c88985 100644 --- a/phpxpress/phpxpress/breadcrumb.php +++ b/phpxpress/Breadcrumb.php @@ -1,7 +1,7 @@ $link){ $this->addElement($caption, $link); } @@ -43,10 +43,10 @@ ** Adds an element at the end of the Breadcrumb */ function addElement($caption, $link){ - + if(isset($this->locations)) $this->locations[$caption] = $link; - + else $this->locations = array($caption => $link); @@ -58,7 +58,7 @@ ** or a string (the caption to be activated) */ function setActiveLocation($activeLocation){ - + if(!is_scalar($activeLocation) && !is_string($activeLocation)) throw new InvalidArgumentException('Parameter activeLocation can be either an int or a string. None of these provided.'); @@ -79,13 +79,13 @@ echo ''; } } -?> \ No newline at end of file +?> diff --git a/phpxpress/phpxpress/card.php b/phpxpress/Card.php similarity index 98% rename from phpxpress/phpxpress/card.php rename to phpxpress/Card.php index 210fa81..b82d025 100644 --- a/phpxpress/phpxpress/card.php +++ b/phpxpress/Card.php @@ -1,7 +1,7 @@ linksArray)){ // links foreach($this->linksArray as $caption => $link){ - echo ''. $caption .''; + echo ''. $caption .''; } echo '

'; - } + } if(isset($this->button)) echo '' . $this->button["text"] . ''; @@ -221,11 +223,10 @@ */ static function beginCardGroupLayout($width=36){ echo '
'; - } + } static function endCardGroupLayout(){ echo '
'; } - } -?> \ No newline at end of file +?> diff --git a/phpxpress/phpxpress/code.php b/phpxpress/Code.php similarity index 100% rename from phpxpress/phpxpress/code.php rename to phpxpress/Code.php diff --git a/phpxpress/phpxpress/dropdown.php b/phpxpress/Dropdown.php similarity index 92% rename from phpxpress/phpxpress/dropdown.php rename to phpxpress/Dropdown.php index 34ae09e..35babc0 100644 --- a/phpxpress/phpxpress/dropdown.php +++ b/phpxpress/Dropdown.php @@ -1,8 +1,7 @@ - size = NULL; - + else if($size == "large") $this->size = "btn-lg"; @@ -77,12 +78,12 @@ } echo ''; } } -?> \ No newline at end of file +?> diff --git a/phpxpress/phpxpress/table.php b/phpxpress/Table.php similarity index 95% rename from phpxpress/phpxpress/table.php rename to phpxpress/Table.php index 357b3ad..e33d813 100644 --- a/phpxpress/phpxpress/table.php +++ b/phpxpress/Table.php @@ -10,8 +10,8 @@ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. */ - - include "include.php"; + namespace PhpXpress; + class Table{ /* === Structure === */ @@ -19,14 +19,14 @@ /** * The datasource to provdide to the table. * Must be an array of arrays or an array of objects. - * + * * @var array */ private $dataSource; /** * The column captions - * + * * @var array */ private $columnCaptions; @@ -35,7 +35,7 @@ * The columns to make invisible. * The column whose name is a key of the array * of the datasource, will not be shown. - * + * * @var array */ private $invisible_columns; @@ -63,7 +63,7 @@ /** * Draw the Table. - * + * * @return void */ function draw(){ @@ -100,7 +100,7 @@ else{ $array_keys = array_keys(get_object_vars($this -> dataSource[0])); } - + $invisible_columns_captions = array(); foreach($this->invisible_columns as $invisible_column_name){ $column_index = array_search($invisible_column_name, $array_keys); @@ -128,7 +128,7 @@ if(!empty($this->invisible_columns) && in_array($name, $this->invisible_columns)){ continue; } - // fire event onValueDisplaying + // fire event onValueDisplaying if(isset( $this -> onValueDisplayingFunctionName)){ call_user_func_array($this -> onValueDisplayingFunctionName , array($name, &$value, (array)$obj)); } @@ -144,8 +144,8 @@ * Set the table's datasource. * Datasource can be either an array of object(s) or * an array of array(s). - * - * @param array $datasource An array of arrays or an array of objects. + * + * @param array $datasource An array of arrays or an array of objects. * * @return void */ @@ -219,8 +219,8 @@ /** * By default, the columns' captions will be the keys of the - * array or object provided. - * + * array or object provided. + * * You can override them by setting custom captions. */ function setCustomCaptions(Array $captions){ @@ -241,7 +241,7 @@ /** * Add columns to the table (setting it before or after the datasource * will show the column before or after the datasource) - * + * * @param string $captionName The name of the new column */ function addColumn($captionName){ @@ -268,7 +268,7 @@ * Making a column invisible, rather than removing it from the datasource, might * be useful in those circumstances where a value is needed in the datasource * or in the onValueDisplaying, without actually removing it. - * + * * @param string $column_name: the column to remove. * */ @@ -291,7 +291,7 @@ if(isset($this->invisible_columns)){ if(in_array($column_name, $this->invisible_columns)) throw new InvalidArgumentException("The provided column $column_name is already invisible"); - + array_push($this->invisible_columns, $column_name); } else{ diff --git a/phpxpress/phpxpress/include.php b/phpxpress/phpxpress/include.php deleted file mode 100644 index 4d7f075..0000000 --- a/phpxpress/phpxpress/include.php +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file