Sfoglia il codice sorgente

changed premissions

Bachir Soussi Chiadmi 11 anni fa
parent
commit
8672e5eb9f
41 ha cambiato i file con 99 aggiunte e 6 eliminazioni
  1. 0 0
      images/search.ai
  2. 0 0
      images/search.png
  3. 0 0
      js/materio_flag-ck.js
  4. 0 0
      js/materio_flag.js
  5. 0 0
      js/materio_page_title-ck.js
  6. 0 0
      js/materio_page_title.js
  7. 0 4
      js/materio_search_api_ajax-ck.js
  8. 3 0
      js/materio_search_api_ajax.js
  9. 0 0
      js/materio_search_api_ajax.min.js
  10. 0 0
      materio_didactique.info
  11. 0 0
      materio_didactique.module
  12. 0 0
      materio_didactique.pages.inc
  13. 0 0
      materio_flag.info
  14. 0 0
      materio_flag.install
  15. 0 0
      materio_flag.module
  16. 0 0
      materio_flag.pages.inc
  17. 0 0
      materio_page_title.info
  18. 0 0
      materio_page_title.module
  19. 0 0
      materio_page_title.pages.inc
  20. 0 0
      materio_search_api.admin.inc
  21. 0 0
      materio_search_api.info
  22. 0 0
      materio_search_api.module
  23. 0 0
      materio_search_api.pages.inc
  24. 0 0
      materio_search_api_ajax.info
  25. 1 1
      materio_search_api_ajax.module
  26. 0 0
      materio_search_api_ajax.pages.inc
  27. 0 0
      materio_taxonomy.info
  28. 0 0
      materio_taxonomy.module
  29. 0 0
      materio_user.info
  30. 95 1
      materio_user.module
  31. 0 0
      templates/materio-didactique-home-block.tpl.php
  32. 0 0
      templates/materio-didactique-page.tpl.php
  33. 0 0
      templates/materio-flag-mybookmarks-block.tpl.php
  34. 0 0
      templates/materio-flag-mylists-block.tpl.php
  35. 0 0
      templates/materio-flag-mylists-list.tpl.php
  36. 0 0
      templates/materio-flag-mylists-nav-block.tpl.php
  37. 0 0
      templates/materio-search-api-actuality.tpl.php
  38. 0 0
      templates/materio-search-api-filters-block.tpl.back
  39. 0 0
      templates/materio-search-api-results.tpl.php
  40. 0 0
      templates/materio-search-api-search-block.tpl.php
  41. 0 0
      templates/materio-search-api-select-viewmode-block.tpl.php

+ 0 - 0
images/search.ai


+ 0 - 0
images/search.png


+ 0 - 0
js/materio_flag-ck.js


+ 0 - 0
js/materio_flag.js


+ 0 - 0
js/materio_page_title-ck.js


+ 0 - 0
js/materio_page_title.js


File diff suppressed because it is too large
+ 0 - 4
js/materio_search_api_ajax-ck.js


+ 3 - 0
js/materio_search_api_ajax.js

@@ -1,4 +1,7 @@
 // @codekit-prepend "gui.js"
+// @koala-prepend "gui.js"
+
+
 
 (function($) {
 

File diff suppressed because it is too large
+ 0 - 0
js/materio_search_api_ajax.min.js


+ 0 - 0
materio_didactique.info


+ 0 - 0
materio_didactique.module


+ 0 - 0
materio_didactique.pages.inc


+ 0 - 0
materio_flag.info


+ 0 - 0
materio_flag.install


+ 0 - 0
materio_flag.module


+ 0 - 0
materio_flag.pages.inc


+ 0 - 0
materio_page_title.info


+ 0 - 0
materio_page_title.module


+ 0 - 0
materio_page_title.pages.inc


+ 0 - 0
materio_search_api.admin.inc


+ 0 - 0
materio_search_api.info


+ 0 - 0
materio_search_api.module


+ 0 - 0
materio_search_api.pages.inc


+ 0 - 0
materio_search_api_ajax.info


+ 1 - 1
materio_search_api_ajax.module

@@ -24,7 +24,7 @@ function materio_search_api_ajax_init() {
     // ),
     'languages' => isset($languages) ? $languages[1] : array(),
   )), 'setting');
-  drupal_add_js(drupal_get_path('module', 'materio_search_api_ajax').'/js/materio_search_api_ajax-ck.js');
+  drupal_add_js(drupal_get_path('module', 'materio_search_api_ajax').'/js/materio_search_api_ajax.min.js');
 }
 
 /**

+ 0 - 0
materio_search_api_ajax.pages.inc


+ 0 - 0
materio_taxonomy.info


+ 0 - 0
materio_taxonomy.module


+ 0 - 0
materio_user.info


+ 95 - 1
materio_user.module

@@ -120,9 +120,57 @@ function materio_user_form_alter(&$form, &$form_state, $form_id) {
   if( $form_id == "webform_client_form_11186" ){
     // dsm($form, '$form');
     $form['#validate'][] = "materio_user_webform_client_111186_validate";
+    $form['#submit'][] = "materio_user_webform_client_111186_submit";
+  }
+
+
+  if( $form_id == "user_profile_form" ){
+    //dsm($form, '$form');
+    $form['account']['pass']['#type'] = "new_password_confirm";
   }
 }
 
+function materio_user_element_info() {
+  return array(
+    "new_password_confirm" => array(
+      '#input' => TRUE,
+      '#process' => array('materio_user_process_new_password_confirm'),
+      '#theme_wrappers' => array('form_element'),
+    ),
+  );
+}
+
+
+/**
+ * Expand a password_confirm field into two text boxes.
+ */
+function materio_user_process_new_password_confirm($element) {
+  $element['pass1'] =  array(
+    '#type' => 'password',
+    '#title' => t('New password'),
+    '#value' => empty($element['#value']) ? NULL : $element['#value']['pass1'],
+    '#required' => $element['#required'],
+    '#attributes' => array('class' => array('password-field')),
+  );
+  $element['pass2'] =  array(
+    '#type' => 'password',
+    '#title' => t('Confirm password'),
+    '#value' => empty($element['#value']) ? NULL : $element['#value']['pass2'],
+    '#required' => $element['#required'],
+    '#attributes' => array('class' => array('password-confirm')),
+  );
+  $element['#element_validate'] = array('password_confirm_validate');
+  $element['#tree'] = TRUE;
+
+  if (isset($element['#size'])) {
+    $element['pass1']['#size'] = $element['pass2']['#size'] = $element['#size'];
+  }
+
+  return $element;
+}
+
+
+
 function materio_user_user_register_form_submit($form, &$form_state){
   // dsm($form, 'form');
   // dsm($form_state, 'form_state');
@@ -166,6 +214,9 @@ function materio_user_webform_client_111186_validate($form, &$form_state){
           $field_name = 'submitted][collaborators]['.$coll_key.']['.$field_key;
           // dsm($field_name, 'field_name');
 
+          // TODO : tester si les email ne sont pas deja inscrit sur le site
+
+
           form_set_error($field_name, t('You must provide a value for the !name field.', array('!name'=>$human_field_name)));      
         }
       }
@@ -174,6 +225,45 @@ function materio_user_webform_client_111186_validate($form, &$form_state){
 
   } 
 
+}
+
+function materio_user_webform_client_111186_submit($form, &$form_state){
+  dsm($form, 'form');
+  dsm($form_state, 'form_state');
+  $values = $form_state['values']['submitted_tree'];
+  if ($values['membership_options'] == 3) {
+    $i = 1;
+    foreach ($values['collaborators'] as $coll_key => $coll) {
+      // foreach ($coll as $field_key => $field_value) {
+      //   if($field_value == ''){
+      //     $human_field_name = $form['submitted']['collaborators'][$coll_key]['#title'] . " : " . $form['submitted']['collaborators'][$coll_key][$field_key]['#title'];
+      //     $field_name = 'submitted][collaborators]['.$coll_key.']['.$field_key;
+      //     // dsm($field_name, 'field_name');
+
+      //     form_set_error($field_name, t('You must provide a value for the !name field.', array('!name'=>$human_field_name)));      
+      //   }
+      // }
+      $userinfo = array(
+        'mail' => $coll['e_mail_collab_'.$i],
+        'name' => user_password(),
+        'pass' => user_password(), // Generate password
+        // 'init' => $data['components']['username']['value'],
+        'status' => 0,
+        'access' => REQUEST_TIME,
+        'memo' => 'from webform',
+      );
+      $account = drupal_anonymous_user();
+      $account->is_new = TRUE;
+      user_save($account, $userinfo);
+      // module_invoke_all('user_insert', $edit, $account);
+      $i++;
+    }
+    
+
+  } 
+
+  // enregistrer le type d'adonnement chez les user
+
 }
 /**
  * Implements hook_help().
@@ -223,7 +313,11 @@ define('MATERIO_USER_CONFIRMED_USER_ROLE', 'Utilisateur'); // add role name here
 /**
  * Implement hook_user
  */
-function __materio_user_user_update(&$edit, $account, $category){
+function materio_user_user_update(&$edit, $account, $category){
+  // dsm($edit, 'edit');
+  // dsm($account, 'account');
+  // dsm($category, 'category');
+  
   // This is only fired when a user confirms their email address, logintoboggan style
   if (isset($account->logintoboggan_email_validated) && $account->logintoboggan_email_validated == TRUE) {    
     $confirmed_rid = materio_user_get_role_by_name(MATERIO_USER_CONFIRMED_USER_ROLE);    

+ 0 - 0
templates/materio-didactique-home-block.tpl.php


+ 0 - 0
templates/materio-didactique-page.tpl.php


+ 0 - 0
templates/materio-flag-mybookmarks-block.tpl.php


+ 0 - 0
templates/materio-flag-mylists-block.tpl.php


+ 0 - 0
templates/materio-flag-mylists-list.tpl.php


+ 0 - 0
templates/materio-flag-mylists-nav-block.tpl.php


+ 0 - 0
templates/materio-search-api-actuality.tpl.php


+ 0 - 0
templates/materio-search-api-filters-block.tpl.back


+ 0 - 0
templates/materio-search-api-results.tpl.php


+ 0 - 0
templates/materio-search-api-search-block.tpl.php


+ 0 - 0
templates/materio-search-api-select-viewmode-block.tpl.php


Some files were not shown because too many files changed in this diff