Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
3cae54c2
Commit
3cae54c2
authored
8 years ago
by
Alexis Algoud
Browse files
Options
Downloads
Patches
Plain Diff
fix travis
parent
4fd24f6d
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
htdocs/blockedlog/class/authority.class.php
+5
-3
5 additions, 3 deletions
htdocs/blockedlog/class/authority.class.php
htdocs/blockedlog/class/blockedlog.class.php
+35
-18
35 additions, 18 deletions
htdocs/blockedlog/class/blockedlog.class.php
with
40 additions
and
21 deletions
htdocs/blockedlog/class/authority.class.php
+
5
−
3
View file @
3cae54c2
...
@@ -18,7 +18,8 @@
...
@@ -18,7 +18,8 @@
/**
/**
* Class to manage certif authority
* Class to manage certif authority
*/
*/
class
BlockedLogAuthority
{
class
BlockedLogAuthority
{
/**
/**
* Id of the log
* Id of the log
...
@@ -113,7 +114,8 @@ class BlockedLogAuthority {
...
@@ -113,7 +114,8 @@ class BlockedLogAuthority {
/**
/**
* Get object from database
* Get object from database
*
*
* @param int $rowid Id of object to load
* @param int $id Id of object to load
* @param string $signature Signature of object to load
* @return int >0 if OK, <0 if KO, 0 if not found
* @return int >0 if OK, <0 if KO, 0 if not found
*/
*/
public
function
fetch
(
$id
,
$signature
=
''
)
{
public
function
fetch
(
$id
,
$signature
=
''
)
{
...
...
This diff is collapsed.
Click to expand it.
htdocs/blockedlog/class/blockedlog.class.php
+
35
−
18
View file @
3cae54c2
...
@@ -19,7 +19,8 @@
...
@@ -19,7 +19,8 @@
* Class to manage Blocked Log
* Class to manage Blocked Log
*/
*/
class
BlockedLog
{
class
BlockedLog
{
/**
/**
* Id of the log
* Id of the log
...
@@ -41,14 +42,34 @@ class BlockedLog {
...
@@ -41,14 +42,34 @@ class BlockedLog {
public
$amounts
=
null
;
public
$amounts
=
null
;
/**
* trigger action
* @var string
*/
public
$action
=
''
;
public
$action
=
''
;
/**
* Object element
* @var string
*/
public
$element
=
''
;
public
$element
=
''
;
/**
* Object id
* @var int
*/
public
$fk_object
=
0
;
public
$fk_object
=
0
;
/**
* Log certified by remote authority or not
* @var boolean
*/
public
$certified
=
false
;
public
$certified
=
false
;
/**
* Author
* @var int
*/
public
$fk_user
=
0
;
public
$fk_user
=
0
;
public
$date_object
=
0
;
public
$date_object
=
0
;
...
@@ -71,8 +92,6 @@ class BlockedLog {
...
@@ -71,8 +92,6 @@ class BlockedLog {
/**
/**
* try to retrieve logged object
* try to retrieve logged object
*
* @param object|string $object object logged
*/
*/
public
function
getObject
()
{
public
function
getObject
()
{
global
$langs
;
global
$langs
;
...
@@ -100,8 +119,6 @@ class BlockedLog {
...
@@ -100,8 +119,6 @@ class BlockedLog {
/**
/**
* try to retrieve user author
* try to retrieve user author
*
* @param object|string $object object logged
*/
*/
public
function
getUser
()
{
public
function
getUser
()
{
global
$langs
,
$cachedUser
;
global
$langs
,
$cachedUser
;
...
@@ -171,7 +188,7 @@ class BlockedLog {
...
@@ -171,7 +188,7 @@ class BlockedLog {
/**
/**
* Get object from database
* Get object from database
*
*
* @param int $
row
id Id of object to load
* @param int $id Id of object to load
* @return int >0 if OK, <0 if KO, 0 if not found
* @return int >0 if OK, <0 if KO, 0 if not found
*/
*/
public
function
fetch
(
$id
)
{
public
function
fetch
(
$id
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment