lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9602 from grandoc/new_branch_24_09_2018

Browse Source 
Standardize and update code
This commit is contained in:
Laurent Destailleur 2018-09-27 09:19:59 +02:00 committed by GitHub
commit b8ae88cf26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 43 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/class/antivir.class.php
View File

@ -40,7 +40,10 @@ class AntiVir
*/ */
public $errors = array(); public $errors = array();
var $output; /**
* @var string Used to return message
*/
public $output;
/** /**
* @var DoliDB Database handler. * @var DoliDB Database handler.

14
htdocs/core/class/canvas.class.php
View File

@ -43,15 +43,15 @@ class Canvas
*/ */
public $errors = array(); public $errors = array();
var $actiontype; public $actiontype;
var $dirmodule; // Module directory public $dirmodule; // Module directory
var $targetmodule; // Module concerned by canvas (ex: thirdparty, contact, ...) public $targetmodule; // Module concerned by canvas (ex: thirdparty, contact, ...)
var $canvas; // Name of canvas (ex: company, individual, product, service, ...) public $canvas; // Name of canvas (ex: company, individual, product, service, ...)
var $card; // Tab (sub-canvas) public $card; // Tab (sub-canvas)
var $template_dir; // Initialized by getCanvas with templates directory public $template_dir; // Initialized by getCanvas with templates directory
var $control; // Initialized by getCanvas with controller instance public $control; // Initialized by getCanvas with controller instance
/** /**

54
htdocs/core/class/dolgraph.class.php
View File

@ -39,46 +39,46 @@
*/ */
class DolGraph class DolGraph
{ {
var $type=array(); // Array with type of each series. Example: array('bars', 'lines', ...) public $type=array(); // Array with type of each series. Example: array('bars', 'lines', ...)
var $mode='side'; // Mode bars graph: side, depth public $mode='side'; // Mode bars graph: side, depth
private $_library='jflot'; // Graphic library to use (jflot, artichow) private $_library='jflot'; // Graphic library to use (jflot, artichow)
//! Array of data //! Array of data
var $data; // Data of graph: array(array('abs1',valA1,valB1), array('abs2',valA2,valB2), ...) public $data; // Data of graph: array(array('abs1',valA1,valB1), array('abs2',valA2,valB2), ...)
var $title; // Title of graph public $title; // Title of graph
var $cssprefix=''; // To add into css styles public $cssprefix=''; // To add into css styles
var $width=380; public $width=380;
var $height=200; public $height=200;
var $MaxValue=0; public $MaxValue=0;
var $MinValue=0; public $MinValue=0;
var $SetShading=0; public $SetShading=0;
var $PrecisionY=-1; public $PrecisionY=-1;
var $horizTickIncrement=-1; public $horizTickIncrement=-1;
var $SetNumXTicks=-1; public $SetNumXTicks=-1;
var $labelInterval=-1; public $labelInterval=-1;
var $hideXGrid=false; public $hideXGrid=false;
var $hideYGrid=false; public $hideYGrid=false;
var $Legend=array(); public $Legend=array();
var $LegendWidthMin=0; public $LegendWidthMin=0;
var $showlegend=1; public $showlegend=1;
var $showpointvalue=1; public $showpointvalue=1;
var $showpercent=0; public $showpercent=0;
var $combine=0; // 0.05 if you want to combine records < 5% into "other" public $combine=0; // 0.05 if you want to combine records < 5% into "other"
var $graph; // Objet Graph (Artichow, Phplot...) public $graph; // Objet Graph (Artichow, Phplot...)
/** /**
* @var string Error code (or message) * @var string Error code (or message)
*/ */
public $error=''; public $error='';
var $bordercolor; // array(R,G,B) public $bordercolor; // array(R,G,B)
var $bgcolor; // array(R,G,B) public $bgcolor; // array(R,G,B)
var $bgcolorgrid=array(255,255,255); // array(R,G,B) public $bgcolorgrid=array(255,255,255); // array(R,G,B)
var $datacolor; // array(array(R,G,B),...) public $datacolor; // array(array(R,G,B),...)
private $stringtoshow; // To store string to output graph into HTML page private $stringtoshow; // To store string to output graph into HTML page

11
htdocs/multicurrency/class/multicurrency.class.php
View File

@ -20,15 +20,14 @@
*/ */
/** /**
* \file dev/skeletons/skeleton_class.class.php * \file htdocs/multicurrency/class/multicurrency.class.php
* \ingroup mymodule othermodule1 othermodule2 * \ingroup multicurrency
* \brief This file is an example for a CRUD class file (Create/Read/Update/Delete) * \brief This file is a CRUD class file (Create/Read/Update/Delete) for multicurrency
* Put some comments here
*/ */
// Put here all includes required by your class file // Put here all includes required by your class file
require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php'; require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
require_once DOL_DOCUMENT_ROOT ."/core/class/commonobjectline.class.php"; require_once DOL_DOCUMENT_ROOT .'/core/class/commonobjectline.class.php';
/** /**
* Class Currency * Class Currency