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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
545cb023
Commit
545cb023
authored
Aug 21, 2012
by
Regis Houssin
Browse files
Options
Downloads
Plain Diff
Merge branch 'develop' of
git+ssh://git@github.com/Dolibarr/dolibarr.git
into task498_objectline
parents
3c13395d
75bfddd7
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
htdocs/comm/action/fiche.php
+3
-3
3 additions, 3 deletions
htdocs/comm/action/fiche.php
htdocs/comm/action/index.php
+8
-7
8 additions, 7 deletions
htdocs/comm/action/index.php
htdocs/core/lib/admin.lib.php
+2
-2
2 additions, 2 deletions
htdocs/core/lib/admin.lib.php
with
13 additions
and
12 deletions
htdocs/comm/action/fiche.php
+
3
−
3
View file @
545cb023
...
...
@@ -460,7 +460,7 @@ if ($action == 'create')
print
'<tr><td>'
.
$langs
->
trans
(
"Title"
)
.
'</td><td><input type="text" name="label" size="60" value="'
.
GETPOST
(
'label'
)
.
'"></td></tr>'
;
// Full day
print
'<tr><td>'
.
$langs
->
trans
(
"EventOnFullDay"
)
.
'</td><td><input type="checkbox" id="fullday" name="fullday" '
.
(
GETPOST
(
'fullday'
)
?
' checked="checked"'
:
''
)
.
'></td></tr>'
;
print
'<tr><td
class="fieldrequired"
>'
.
$langs
->
trans
(
"EventOnFullDay"
)
.
'</td><td><input type="checkbox" id="fullday" name="fullday" '
.
(
GETPOST
(
'fullday'
)
?
' checked="checked"'
:
''
)
.
'></td></tr>'
;
// Date start
$datep
=
$actioncomm
->
datep
;
...
...
@@ -483,7 +483,7 @@ if ($action == 'create')
print
'<tr><td width="10%">'
.
$langs
->
trans
(
"Status"
)
.
' / '
.
$langs
->
trans
(
"Percentage"
)
.
'</td>'
;
print
'<td>'
;
$percent
=-
1
;
if
(
GET
POST
(
'percentage'
))
if
(
isset
(
$_GET
[
'percentage'
])
||
isset
(
$_
POST
[
'percentage'
]
))
{
$percent
=
GETPOST
(
'percentage'
);
}
...
...
@@ -704,7 +704,7 @@ if ($id)
print
'<tr><td>'
.
$langs
->
trans
(
"Title"
)
.
'</td><td colspan="3"><input type="text" name="label" size="50" value="'
.
$act
->
label
.
'"></td></tr>'
;
// Full day event
print
'<tr><td>'
.
$langs
->
trans
(
"EventOnFullDay"
)
.
'</td><td colspan="3"><input type="checkbox" id="fullday" name="fullday" '
.
(
$act
->
fulldayevent
?
' checked="checked"'
:
''
)
.
'></td></tr>'
;
print
'<tr><td
class="fieldrequired"
>'
.
$langs
->
trans
(
"EventOnFullDay"
)
.
'</td><td colspan="3"><input type="checkbox" id="fullday" name="fullday" '
.
(
$act
->
fulldayevent
?
' checked="checked"'
:
''
)
.
'></td></tr>'
;
// Date start
print
'<tr><td nowrap="nowrap" class="fieldrequired">'
.
$langs
->
trans
(
"DateActionStart"
)
.
'</td><td colspan="3">'
;
...
...
This diff is collapsed.
Click to expand it.
htdocs/comm/action/index.php
+
8
−
7
View file @
545cb023
...
...
@@ -746,11 +746,13 @@ if (! is_array($theme_datacolor)) $theme_datacolor=array(array(120,130,150), arr
if
(
empty
(
$action
)
||
$action
==
'show_month'
)
// View by month
{
$newparam
=
$param
;
// newparam is for birthday links
$newparam
=
preg_replace
(
'/showbirthday=/i'
,
'showbirthday_='
,
$newparam
);
// To avoid replacement when replace day= is done
$newparam
=
preg_replace
(
'/action=show_month&?/i'
,
''
,
$newparam
);
$newparam
=
preg_replace
(
'/action=show_week&?/i'
,
''
,
$newparam
);
$newparam
=
preg_replace
(
'/day=[0-9]
[0-9]
&?/i'
,
''
,
$newparam
);
$newparam
=
preg_replace
(
'/month=[0-9]
[0-9]
&?/i'
,
''
,
$newparam
);
$newparam
=
preg_replace
(
'/day=[0-9]
+
&?/i'
,
''
,
$newparam
);
$newparam
=
preg_replace
(
'/month=[0-9]
+
&?/i'
,
''
,
$newparam
);
$newparam
=
preg_replace
(
'/year=[0-9]+&?/i'
,
''
,
$newparam
);
$newparam
=
preg_replace
(
'/showbirthday_=/i'
,
'showbirthday='
,
$newparam
);
// Restore correct parameter
echo
'<table width="100%" class="nocellnopadd">'
;
echo
' <tr class="liste_titre">'
;
$i
=
0
;
...
...
@@ -812,11 +814,13 @@ if (empty($action) || $action == 'show_month') // View by month
elseif
(
$action
==
'show_week'
)
// View by week
{
$newparam
=
$param
;
// newparam is for birthday links
$newparam
=
preg_replace
(
'/showbirthday=/i'
,
'showbirthday_='
,
$newparam
);
// To avoid replacement when replace day= is done
$newparam
=
preg_replace
(
'/action=show_month&?/i'
,
''
,
$newparam
);
$newparam
=
preg_replace
(
'/action=show_week&?/i'
,
''
,
$newparam
);
$newparam
=
preg_replace
(
'/day=[0-9]
[0-9]
&?/i'
,
''
,
$newparam
);
$newparam
=
preg_replace
(
'/month=[0-9]
[0-9]
&?/i'
,
''
,
$newparam
);
$newparam
=
preg_replace
(
'/day=[0-9]
+
&?/i'
,
''
,
$newparam
);
$newparam
=
preg_replace
(
'/month=[0-9]
+
&?/i'
,
''
,
$newparam
);
$newparam
=
preg_replace
(
'/year=[0-9]+&?/i'
,
''
,
$newparam
);
$newparam
=
preg_replace
(
'/showbirthday_=/i'
,
'showbirthday='
,
$newparam
);
// Restore correct parameter
echo
'<table width="100%" class="nocellnopadd">'
;
echo
' <tr class="liste_titre">'
;
$i
=
0
;
...
...
@@ -868,9 +872,6 @@ else // View by day
$newparam
=
$param
;
// newparam is for birthday links
$newparam
=
preg_replace
(
'/action=show_month&?/i'
,
''
,
$newparam
);
$newparam
=
preg_replace
(
'/action=show_week&?/i'
,
''
,
$newparam
);
$newparam
=
preg_replace
(
'/day=[0-9][0-9]&?/i'
,
''
,
$newparam
);
$newparam
=
preg_replace
(
'/month=[0-9][0-9]&?/i'
,
''
,
$newparam
);
$newparam
=
preg_replace
(
'/year=[0-9]+&?/i'
,
''
,
$newparam
);
// Code to show just one day
$style
=
'cal_current_month'
;
$today
=
0
;
...
...
This diff is collapsed.
Click to expand it.
htdocs/core/lib/admin.lib.php
+
2
−
2
View file @
545cb023
...
...
@@ -253,7 +253,7 @@ function run_sql($sqlfile,$silent=1,$entity='',$usesavepoint=1,$handler='',$oker
dol_syslog
(
'Admin.lib::run_sql Request '
.
(
$i
+
1
)
.
' sql='
.
$newsql
,
LOG_DEBUG
);
// Replace for encrypt data
if
(
preg_match_all
(
'/__ENCRYPT\(\'([
^\,
]+)\'\)__/i'
,
$newsql
,
$reg
))
if
(
preg_match_all
(
'/__ENCRYPT\(\'([
A-Za-z0-9_
]+)\'\)__/i'
,
$newsql
,
$reg
))
{
$num
=
count
(
$reg
[
0
]);
...
...
@@ -266,7 +266,7 @@ function run_sql($sqlfile,$silent=1,$entity='',$usesavepoint=1,$handler='',$oker
}
// Replace for decrypt data
if
(
preg_match_all
(
'/__DECRYPT\(\'([
^\,
]+)\'\)__/i'
,
$newsql
,
$reg
))
if
(
preg_match_all
(
'/__DECRYPT\(\'([
A-Za-z0-9_
]+)\'\)__/i'
,
$newsql
,
$reg
))
{
$num
=
count
(
$reg
[
0
]);
...
...
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