diff --git a/oc_api/OpenClassroomsAPI.php b/oc_api/OpenClassroomsAPI.php
index 39a91b6cf56464b7dd402ed52ca483b381dd1af4..b9e31c5e54a66d6eae738bb7e900f1af4938a1af 100644
--- a/oc_api/OpenClassroomsAPI.php
+++ b/oc_api/OpenClassroomsAPI.php
@@ -414,7 +414,10 @@ class OpenClassroomsAPI {
$this->user_data = get_user_meta($user_id, 'OpenClassroomsAPI/UserData', true);
} else {
session_start();
- $this->user_data = $_SESSION['OpenClassroomsAPI/UserData'];
+ if (isset($_SESSION['OpenClassroomsAPI/UserData']))
+ $this->user_data = $_SESSION['OpenClassroomsAPI/UserData'];
+ else
+ $this->user_data = array();
}
}
if ($value !== NULL) {
@@ -439,8 +442,8 @@ class OpenClassroomsAPI {
$httpkeys_file = plugin_dir_path( __FILE__ ).'.httpkeys';
if (is_file($httpkeys_file)) {
include($httpkeys_file);
- if (!(isset(self::$httpkeys) && isset(self::$httpkeys['client_id']) && isset(self::$httpkeys['basic_auth']) && isset(self::$httpkeys['reditect_url'])))
- self::reportLog("OpenClassroomsAPI::getAuth: Bad '.httpkeys' file format");
+ if (!(isset($httpkeys) && isset($httpkeys['OAuth2/client_id']) && isset($httpkeys['OAuth2/basic_auth']) && isset($httpkeys['OAuth2/redirect_uri'])))
+ self::reportLog("OpenClassroomsAPI::getAuth: Bad '.httpkeys' file format #".isset($httpkeys)."-client_id:".isset($httpkeys['OAuth2/client_id'])."-basic_auth:".isset($httpkeys['OAuth2/basic_auth'])."-redirect_uri:".isset($httpkeys['OAuth2/redirect_uri']));
} else {
self::reportLog("OpenClassroomsAPI::getAuth: Unable to read the '.httpkeys' file");
exit(0);
@@ -602,8 +605,8 @@ class OpenClassroomsAPI {
// Mails logs to 'OAuth2/log_email'
private static function reportLog($message) {
$log_message = "\n[".date('c').", ".wp_get_current_user()->user_nicename."] ".preg_replace("/\s+/", " ", $message)."\n";
- if (self::getAuth('OAuth2/log_email'))
- mail(self::getAuth('OAuth2/log_email'), "OpenClassroomsAPI log alert", $log_message, "Content-type: text/html; charset=utf-8\r\nContent-Transfer-Encoding: 8bit\r\n");
+ $log_email = "thierry.vieville@inria.fr";
+ mail($log_email, "OpenClassroomsAPI log alert", $log_message, "Content-type: text/html; charset=utf-8\r\nContent-Transfer-Encoding: 8bit\r\n");
}
}
diff --git a/sos-sort/index.php b/sos-sort/index.php
index a65771277a0c43b68ecb827cb7d649218aa68d19..000306aae09cf3e9f6bc092f36fdd051a5e05edb 100644
--- a/sos-sort/index.php
+++ b/sos-sort/index.php
@@ -25,12 +25,16 @@ function get_cat_order($categories) {
"1-2-3-codez" => 10,
"1-2-3-codez-tome-1" => 11,
"1-2-3-codez-tome-2" => 12,
+ "activite-multi-disciplinaire" => 13,
"presentation-du-cours" => 20,
"n-le-numerique-et-ses-sciences-dans-le-reel" => 21,
"i-l-informatique-et-ses-fondements" => 22,
"c-creer-des-projets-pour-l-icn" => 23,
"parcours-mgistere" => 24,
- "informatics-and-digital-creation" =>25);
+ "informatics-and-digital-creation" =>25,
+ "n-informatics-and-digital-creation" =>26,
+ "i-informatics-and-digital-creation" =>27,
+ "c-informatics-and-digital-creation" =>28);
$cats_cycle_order = array(
"cycle-1" => 11,
"cycle-2" => 12,
@@ -43,7 +47,7 @@ function get_cat_order($categories) {
return $p_order == 0 ? 99 : $p_order;
}
-$all_categories = array('module-1', 'module-2', 'module-3', 'module-4', 'module-5', '1-2-3-codez', '1-2-3-codez-tome-1', '1-2-3-codez-tome-2', 'cycle-1', 'cycle-2', 'cycle-3', 'cycle-4', 'presentation-du-cours', 'n-le-numerique-et-ses-sciences-dans-le-reel', 'i-l-informatique-et-ses-fondements', 'c-creer-des-projets-pour-l-icn', 'parcours-mgistere', 'texte', 'video', 'livre', 'activite', 'fiche-d-activite', 'activite-debranchee', 'activite-branchee', 'scratch', 'thymio', 'vpl', 'vpl-avance', 'arduino', 'blocky', 'prendre-du-recul', 'histoire-de-linformatique', 'pedagogie', 'ressources-et-supports-scolaires', 'educateurs', 'professeurs-des-ecoles', 'professeurs-du-secondaire', 'parents', 'initiation-algorithme', 'initiation-a-la-programmation', 'representation-information', 'primaire', 'college', 'informatics-and-digital-creation');
+$all_categories = array('module-1', 'module-2', 'module-3', 'module-4', 'module-5', '1-2-3-codez', '1-2-3-codez-tome-1', '1-2-3-codez-tome-2', 'activite-multi-disciplinaire', 'cycle-1', 'cycle-2', 'cycle-3', 'cycle-4', 'presentation-du-cours', 'n-le-numerique-et-ses-sciences-dans-le-reel', 'i-l-informatique-et-ses-fondements', 'c-creer-des-projets-pour-l-icn', 'parcours-mgistere', 'texte', 'video', 'livre', 'activite', 'fiche-d-activite', 'activite-debranchee', 'activite-branchee', 'scratch', 'thymio', 'vpl', 'vpl-avance', 'arduino', 'blocky', 'prendre-du-recul', 'histoire-de-linformatique', 'pedagogie', 'ressources-et-supports-scolaires', 'educateurs', 'professeurs-des-ecoles', 'professeurs-du-secondaire', 'parents', 'initiation-algorithme', 'initiation-a-la-programmation', 'representation-information', 'primaire', 'college', 'informatics-and-digital-creation', 'n-informatics-and-digital-creation', 'i-informatics-and-digital-creation', 'c-informatics-and-digital-creation');
$bad_categories = array('a-la-carte', 'modules', 'mooc-icn-informatique-et-creation-numerique', 'cycles-scolaires', 'epi-enseignement-pratique-et-interdisciplinaire', 'les-parcours', 'ressources-a-la-une', '2014-10-octobre', 'bonne-feuille', 'a-decouvrir', 'plateforme', 'septembre-2014');
// Gets all a-la-carte posts and builds the related meta-data
diff --git a/sos-sort/makefile b/sos-sort/makefile
index 878e390265c6c4978ac1a19591a668d9fbf0d7ae..4add1943ae64b77317b8763c930676431673b524 100644
--- a/sos-sort/makefile
+++ b/sos-sort/makefile
@@ -1,6 +1,7 @@
all :
php -l index.php
- show.sh spub
+ git pull ; git commit -a -m '.' ; git push
+ firefox https://gitlab.inria.fr/ClassCode/class_code/-/jobs
firefox https://pixees.fr/wp-content/plugins/class_code/sos-sort/index.php
sort :