Skip to content
This repository was archived by the owner on Nov 25, 2020. It is now read-only.

Commit 09fa8a1

Browse files
leobouillouxleobouilloux
committed
Merge remote-tracking branch 'origin/develop' into develop
2 parents 2055608 + a5afbb4 commit 09fa8a1

File tree

120 files changed

+5131
-3582
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+5131
-3582
lines changed

‎core/src/core/classes/class.AJXP_Utils.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public static function detectXSS($string) {
160160
'#(<[^>]+[\x00-\x20\"\'\/])style=[^>]*>?#iUu',
161161

162162
// Match unneeded tags
163-
'#</*(applet|meta|xml|blink|link|style|script|embed|object|iframe|frame|frameset|ilayer|layer|bgsound|title|base)[^>]*>?#i'
163+
'#</*(applet|meta|xml|blink|link|style|script|embed|object|iframe|frame|frameset|ilayer|layer|bgsound|title|base|svg)[^>]*>?#i'
164164
);
165165

166166
foreach($patterns as $pattern) {

‎core/src/plugins/access.ajxp_home/class.UserDashboardHome.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ Class.create("UserDashboardHome", AjxpPane, {
158158
switchToRepo(repoId);
159159
}
160160
};
161-
attachMobilTouchForClick(repoEl, select);
162161
disableTextSelection(repoEl);
163162
if(simpleClickOpen){
164163
repoEl.observe("click", function(e){

‎core/src/plugins/access.fs/fsTemplatePart.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<h3 class="colorcode-bookmark" ajxp_message_id="147">AJXP_MESSAGE[147]
2020
<small id="bookmarks_toggler" class="simple-toggler-show" ajxpClass="VisibilityToggler" ajxpOptions='{"widget_id":"flagged_elements"}'>AJXP_MESSAGE[513]</small>
2121
</h3>
22-
<div style="display:none;" id="flagged_elements" ajxpClass="FetchedResultPane" ajxpOptions='{"replaceScroller":false, "fit":"content", "silentLoading":true, "nodeProviderProperties":{"get_action":"search", "query":"keyword:ajxp_bookmarked"},"reloadOnServerMessage":"tree/reload_bookmarks", "connexion_discrete":true, "containerDroppableAction":"bookmark", "emptyChildrenMessage":515}'></div>
22+
<div style="display:none;" id="flagged_elements" ajxpClass="FetchedResultPane" ajxpOptions='{"replaceScroller":false, "fit":"content", "silentLoading":true, "nodeProviderProperties":{"get_action":"search", "query":"keyword:ajxp_bookmarked"},"reloadOnServerMessage":"tree/reload_bookmarks", "connexion_discrete":true, "containerDroppableAction":"bookmark", "emptyChildrenMessage":515,"clearSelectionOnBlur":true}'></div>
2323
</div>
2424
<div id="navigation_folders" ajxp_position="3">
2525
<h3 class="colorcode-folder" ajxp_message_id="130">AJXP_MESSAGE[130]

‎core/src/plugins/action.scheduler/class.AjxpScheduler.php

100644100755
Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,11 @@ public function runTask($taskId, $status = null, &$currentlyRunning = -1, $force
189189
$data["user_id"] = "queue:".$tmpQueue;
190190
}
191191
if ($data["repository_id"] == "*") {
192-
$data["repository_id"] = implode(",", array_keys(ConfService::getRepositoriesList("all")));
192+
$criteria = array();
193+
$criteria["isTemplate"] = false;
194+
$count = 0;
195+
$listRepos = ConfService::listRepositoriesWithCriteria($criteria, $count);
196+
$data["repository_id"] = implode(",", array_keys($listRepos));
193197
}
194198
$process = AJXP_Controller::applyActionInBackground(
195199
$data["repository_id"],
@@ -270,7 +274,7 @@ public function switchAction($action, $httpVars, $postProcessData)
270274
AJXP_XMLWriter::close();
271275
}
272276

273-
break;
277+
break;
274278

275279
case "scheduler_runTask":
276280

@@ -280,7 +284,7 @@ public function switchAction($action, $httpVars, $postProcessData)
280284
AJXP_XMLWriter::reloadDataNode();
281285
AJXP_XMLWriter::close();
282286

283-
break;
287+
break;
284288

285289
case "scheduler_generateCronExpression":
286290

@@ -291,10 +295,10 @@ public function switchAction($action, $httpVars, $postProcessData)
291295
HTMLWriter::charsetHeader("text/plain", "UTF-8");
292296
print "$cronTiming $phpCmd $rootInstall -r=ajxp_conf -u=".AuthService::getLoggedUser()->getId()." -p=YOUR_PASSWORD_HERE -a=scheduler_runAll >> $logFile";
293297

294-
break;
298+
break;
295299

296300
default:
297-
break;
301+
break;
298302
}
299303

300304
}
@@ -331,26 +335,26 @@ public function listTasks($action, $httpVars, $postProcessData)
331335

332336
$timeArray = $this->getTimeArray($task["schedule"]);
333337
$res = $this->getNextExecutionTimeForScript(time(), $timeArray);
334-
$task["NEXT_EXECUTION"] = date($mess["date_format"], $res);
335-
$task["PARAMS"] = implode(", ", $task["PARAMS"]);
336-
$task["icon"] = "scheduler/ICON_SIZE/task.png";
337-
$task["ajxp_mime"] = "scheduler_task";
338-
$sFile = AJXP_CACHE_DIR."/cmd_outputs/task_".$task["task_id"].".status";
339-
if (is_file($sFile)) {
340-
$s = $this->getTaskStatus($task["task_id"]);
341-
$task["STATUS"] = implode(":", $s);
342-
$task["LAST_EXECUTION"] = date($mess["date_format"], filemtime($sFile));
343-
} else {
344-
$task["STATUS"] = "n/a";
345-
$task["LAST_EXECUTION"] = "n/a";
346-
}
347-
348-
AJXP_XMLWriter::renderNode("/admin/scheduler/".$task["task_id"],
349-
(isSet($task["label"])?$task["label"]:"Action ".$task["action_name"]),
350-
true,
351-
$task
352-
);
338+
$task["NEXT_EXECUTION"] = date($mess["date_format"], $res);
339+
$task["PARAMS"] = implode(", ", $task["PARAMS"]);
340+
$task["icon"] = "scheduler/ICON_SIZE/task.png";
341+
$task["ajxp_mime"] = "scheduler_task";
342+
$sFile = AJXP_CACHE_DIR."/cmd_outputs/task_".$task["task_id"].".status";
343+
if (is_file($sFile)) {
344+
$s = $this->getTaskStatus($task["task_id"]);
345+
$task["STATUS"] = implode(":", $s);
346+
$task["LAST_EXECUTION"] = date($mess["date_format"], filemtime($sFile));
347+
} else {
348+
$task["STATUS"] = "n/a";
349+
$task["LAST_EXECUTION"] = "n/a";
353350
}
351+
352+
AJXP_XMLWriter::renderNode("/admin/scheduler/".$task["task_id"],
353+
(isSet($task["label"])?$task["label"]:"Action ".$task["action_name"]),
354+
true,
355+
$task
356+
);
357+
}
354358
AJXP_XMLWriter::close();
355359

356360
}
@@ -457,7 +461,7 @@ public function handleTasks($action, $httpVars, $fileVars)
457461
AJXP_XMLWriter::reloadDataNode();
458462
AJXP_XMLWriter::close();
459463

460-
break;
464+
break;
461465

462466
case "scheduler_removeTask" :
463467

@@ -467,7 +471,7 @@ public function handleTasks($action, $httpVars, $fileVars)
467471
AJXP_XMLWriter::reloadDataNode();
468472
AJXP_XMLWriter::close();
469473

470-
break;
474+
break;
471475

472476
case "scheduler_loadTask":
473477

@@ -502,10 +506,10 @@ public function handleTasks($action, $httpVars, $fileVars)
502506
echo json_encode($task);
503507
}
504508

505-
break;
509+
break;
506510

507511
default:
508-
break;
512+
break;
509513
}
510514
//var_dump($tasks);
511515

@@ -663,4 +667,4 @@ public function nextMinute($timeArray, &$a, &$m, &$j, &$h, &$min)
663667
if ($min == 60) { return -1; }
664668
} while ($valeurs[$min] != TRUE);
665669
}
666-
}
670+
}

‎core/src/plugins/auth.cmsms/class.cmsmsAuthDriver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,14 +110,14 @@ public function checkPassword($login, $pass, $seed)
110110
{
111111
$userStoredPass = $this->getUserPass($login);
112112
if(!$userStoredPass) return false;
113-
if (md5($pass) == $userStoredPass) {
113+
if (md5($pass) === $userStoredPass) {
114114
$loggedinData['sessionid']=session_id();
115115
$loggedinData['lastused']=time();
116116
$loggedinData['userid']=$this->getUserId($login);
117117
dibi::query('INSERT INTO ['.$this->prefix.'module_feusers_loggedin]', $loggedinData);
118118
}
119119

120-
return ($userStoredPass == md5($pass));
120+
return ($userStoredPass === md5($pass));
121121
}
122122

123123
public function usersEditable()

‎core/src/plugins/auth.custom_db/class.customDbAuthDriver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public function checkPassword($login, $pass, $seed)
158158
if($hashAlgo == "pbkdf2"){
159159
return AJXP_Utils::pbkdf2_validate_password($pass, $userStoredPass);
160160
}else if($hashAlgo == "md5"){
161-
return md5($pass) == $userStoredPass;
161+
return md5($pass) === $userStoredPass;
162162
}else if($hashAlgo == "clear"){
163163
return $pass == $userStoredPass;
164164
}

‎core/src/plugins/auth.remote/class.remoteAuthDriver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public function checkPassword($login, $pass, $seed)
167167
if ($seed == "-1") { // Seed = -1 means that password is not encoded.
168168
return AJXP_Utils::pbkdf2_validate_password($pass, $userStoredPass);// ($userStoredPass == md5($pass));
169169
} else {
170-
return (md5($userStoredPass.$seed) == $pass);
170+
return (md5($userStoredPass.$seed) === $pass);
171171
}
172172
} else {
173173
$crtSessionId = session_id();
@@ -218,7 +218,7 @@ public function checkPassword($login, $pass, $seed)
218218
if ($seed == "-1") { // Seed = -1 means that password is not encoded.
219219
$res = AJXP_Utils::pbkdf2_validate_password($pass, $userStoredPass); //($userStoredPass == md5($pass));
220220
} else {
221-
$res = (md5($userStoredPass.$seed) == $pass);
221+
$res = (md5($userStoredPass.$seed) === $pass);
222222
}
223223
if ($res) {
224224
session_id($crtSessionId);

‎core/src/plugins/auth.serial/class.serialAuthDriver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public function checkPassword($login, $pass, $seed)
119119
if ($seed == "-1") { // Seed = -1 means that password is not encoded.
120120
return AJXP_Utils::pbkdf2_validate_password($pass, $userStoredPass);//($userStoredPass == md5($pass));
121121
} else {
122-
return (md5($userStoredPass.$seed) == $pass);
122+
return (md5($userStoredPass.$seed) === $pass);
123123
}
124124
}
125125

‎core/src/plugins/auth.sql/class.sqlAuthDriver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public function checkPassword($login, $pass, $seed)
157157
if ($this->getOptionAsBool("TRANSMIT_CLEAR_PASS")) { // Seed = -1 means that password is not encoded.
158158
return AJXP_Utils::pbkdf2_validate_password($pass, $userStoredPass); //($userStoredPass == md5($pass));
159159
} else {
160-
return (md5($userStoredPass.$seed) == $pass);
160+
return (md5($userStoredPass.$seed) === $pass);
161161
}
162162
}
163163

‎core/src/plugins/core.notifications/manifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
<additional_content id="navigation_alerts"><![CDATA[
135135
<div id="navigation_alerts" ajxp_position="0">
136136
<h3 class="colorcode-alert" ajxp_message_id="notification_center.3">AJXP_MESSAGE[notification_center.3] <span class="alerts_number_badge" id="alerts_number" ajxpClass="DataModelProperty" ajxpOptions='{"dmID":"notif_pane","property":"metadata","metadata_sum":"event_occurence"}'></span><small id="alerts_toggler" class="simple-toggler-hide" ajxpClass="VisibilityToggler" ajxpOptions='{"widget_id":"notif_pane"}'>AJXP_MESSAGE[514]</small></h3>
137-
<div id="notif_pane" ajxpClass="FetchedResultPane" ajxpOptions='{"forceClearOnRepoSwitch":true, "inlineToolbarOptions":{"toolbarsList":["inline-notifications"]}, "fit":"content", "columnsDef":[{"attributeName":"ajxp_label", "messageId":1, "sortType":"String"},{"attributeName":"event_description", "messageString":"Description", "sortType":"String"}], "reloadOnServerMessage":"tree/reload_user_feed", "silentLoading":true, "fixedSortColumn":"event_time", "fixedSortDirection":"desc","nodeProviderProperties":{"get_action":"get_my_feed", "connexion_discrete":true, "format":"xml", "current_repository":"true", "feed_type":"alert", "merge_description":"true"}, "emptyChildrenMessage":"notification_center.8"}'></div>
137+
<div id="notif_pane" ajxpClass="FetchedResultPane" ajxpOptions='{"forceClearOnRepoSwitch":true, "inlineToolbarOptions":{"toolbarsList":["inline-notifications"]}, "fit":"content", "columnsDef":[{"attributeName":"ajxp_label", "messageId":1, "sortType":"String"},{"attributeName":"event_description", "messageString":"Description", "sortType":"String"}], "reloadOnServerMessage":"tree/reload_user_feed", "silentLoading":true, "fixedSortColumn":"event_time", "fixedSortDirection":"desc","nodeProviderProperties":{"get_action":"get_my_feed", "connexion_discrete":true, "format":"xml", "current_repository":"true", "feed_type":"alert", "merge_description":"true"}, "emptyChildrenMessage":"notification_center.8","clearSelectionOnBlur":true}'></div>
138138
</div>
139139
]]></additional_content>
140140
</component_config>

0 commit comments

Comments
 (0)