Don't like ads? PRO users don't see any ads ;-)
Public Pastes
Guest

Untitled

By: a guest on Aug 9th, 2012  |  syntax: PHP  |  size: 5.43 KB  |  hits: 15  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. git diff
  2. diff --git a/sites/default/controller/controller.php b/sites/default/controller/controller.php
  3. index 4bd6c33..558abad 100644
  4. --- a/sites/default/controller/controller.php
  5. +++ b/sites/default/controller/controller.php
  6. @@ -2602,8 +2602,8 @@ function framework_preprocess_page_set_body_specific_classes($left, $right) {
  7.      $class[] = 'sidebar-right';
  8.    }
  9.    
  10. -  if (arg(0) == ADMIN_NAME) {
  11. -    $class[] = ADMIN_NAME;
  12. +  if (arg(0) == KL_PATH_ADMIN) {
  13. +    $class[] = 'admin';
  14.    }
  15.    if (arg(0) == 'glossary') {
  16.      $class[] = 'glossary';
  17. diff --git a/sites/default/modules/kl/kl.module b/sites/default/modules/kl/kl.module
  18. index e56df42..f93df4c 100644
  19. --- a/sites/default/modules/kl/kl.module
  20. +++ b/sites/default/modules/kl/kl.module
  21. @@ -395,7 +395,7 @@ function kl_user_is_authorized_to_connect_when_overload($username, $password) {
  22.    $account = user_load($uid);
  23.    
  24.    // Users with admin roles should be able to login
  25. -  if (kl_functions_user_has_role($account, array(ADMIN_NAME, KREAEMPLOYEE_NAME, SPECIAL_BRAND_USER_NAME, BRAND_EMPLOYEE_NAME))){
  26. +  if (kl_user_has_roles($account, array(KL_ROLE_ADMIN_RID, KL_ROLE_KREA_EMPLOYEE_RID, KL_ROLE_SPECIAL_BRAND_USER_RID, KL_ROLE_BRAND_EMPLOYEE_RID))){
  27.      return true;
  28.    }
  29.    
  30. diff --git a/sites/default/modules/krealinks/krealinks.constants.inc b/sites/default/modules/krealinks/krealinks.constants.inc
  31. index 5750fab..245618f 100644
  32. --- a/sites/default/modules/krealinks/krealinks.constants.inc
  33. +++ b/sites/default/modules/krealinks/krealinks.constants.inc
  34. @@ -190,6 +190,7 @@ define('KL_PATH_USER', 'user');
  35.  define('KL_PATH_ACTU', 'actualites-innovation');
  36.  define('KL_PATH_TUTO', 'tutoriaux');
  37.  define('KL_PATH_REGISTER', 'user/register');
  38. +define('KL_PATH_ADMIN','admin');
  39.  define('KL_PATH_MEMBERS_SPACE', 'espaces-membres');
  40.  define('KL_PATH_ELEMENT_POPUP','popup');
  41.  define('KL_PATH_ELEMENT_EDIT','edit');
  42. diff --git a/sites/default/modules/krealinks/krealinks.module b/sites/default/modules/krealinks/krealinks.module
  43. index 5148049..137bb01 100644
  44. --- a/sites/default/modules/krealinks/krealinks.module
  45. +++ b/sites/default/modules/krealinks/krealinks.module
  46. @@ -690,7 +690,7 @@ function krealinks_menu() {
  47.    );
  48.  
  49.  // TODO:KLVIEWFORM  
  50. -/*  $items[ADMIN_NAME . '/' . FORBLOG_PATH . '/moderate/topics'  ] = array(
  51. +/*  $items[KL_PATH_ADMIN . '/' . FORBLOG_PATH . '/moderate/topics'  ] = array(
  52.      'title' => 'Forblog alterted topics',
  53.      'type' => MENU_CALLBACK,
  54.      'page callback' => 'krealinks_return_empty_string',
  55. @@ -1554,7 +1554,7 @@ function krealinks_node_access_modified($op = NULL, $node = NULL, $account = NUL
  56.      // Only admin should access these nodes, redirect other users.
  57.      $destination = drupal_get_destination();
  58.      $content_types_admin = array('advert', 'blog', 'caccinfo', 'feed', 'info', 'profile', 'story');
  59. -    if (in_array($node->type, $content_types_admin) && !kl_functions_user_has_role($user, ADMIN_NAME)) {
  60. +    if (in_array($node->type, $content_types_admin) && !kl_user_has_roles($user, KL_ROLE_ADMIN_RID)) {
  61.        drupal_goto(KL_PATH_REGISTER, $destination);
  62.      }
  63.    }
  64. @@ -3095,7 +3095,7 @@ function krealinks_block($op = 'list', $delta = 0, $edit = array()) {
  65.  /*      $blocks['forblog_alerted_topic'] = array(
  66.          'info'       => 'Forblog alerted topics',
  67.          'visibility' => 2,
  68. -        'pages'      => '<?php if (arg(0) == ADMIN_NAME && arg(1) == FORBLOG_PATH && arg(2) == "moderate" && arg(3) == topics) return TRUE; return FALSE; ?>',
  69. +        'pages'      => '<?php if (arg(0) == KL_PATH_ADMIN && arg(1) == FORBLOG_PATH && arg(2) == "moderate" && arg(3) == topics) return TRUE; return FALSE; ?>
  70.          'region'     => 'content_top',
  71.          'weight'     => 10,
  72.          'status'     => 1,
  73. diff --git a/sites/default/modules/krealinks_form/deprecated/krealinks_form_topic.inc b/sites/default/modules/krealinks_form/deprecated/krealinks_form_topic.inc
  74. index 9ee976b..a7ebaa8 100644
  75. --- a/sites/default/modules/krealinks_form/deprecated/krealinks_form_topic.inc
  76. +++ b/sites/default/modules/krealinks_form/deprecated/krealinks_form_topic.inc
  77. @@ -21,7 +21,7 @@ function kl_form_topic_gtopic_building(&$form) {
  78.      $user_is_prospect = kl_functions_user_has_role($user, ROLE_PROSPECT_NAME);
  79.      $user_is_observer = kl_functions_user_has_role($user, GROUP_OBSERVER_NAME);
  80.      $user_is_animator = kl_functions_user_has_role($user, GROUP_ANIMATOR_NAME);
  81. -    $user_is_admin = kl_functions_user_has_role($user, ADMIN_NAME);
  82. +    $user_is_admin = kl_user_has_roles($user, KL_ROLE_ADMIN_RID);
  83.      if ($user_is_admin=="1") {$user_admin=TRUE;} else {$user_admin=FALSE;}
  84.  
  85.      $modeForblog = ($form['#node']->type == 'topic') ? TRUE : FALSE;
  86. diff --git a/sites/default/modules/krealinks_form/kl_form_alter_gtopic_node_form.inc b/sites/default/modules/krealinks_form/kl_form_alter_gtopic_node_form.inc
  87. index 4d2fa2b..35e2e28 100644
  88. --- a/sites/default/modules/krealinks_form/kl_form_alter_gtopic_node_form.inc
  89. +++ b/sites/default/modules/krealinks_form/kl_form_alter_gtopic_node_form.inc
  90. @@ -13,7 +13,7 @@ function kl_form_alter_gtopic_node_form_building(&$form) {
  91.    global $user;
  92.    $user_is_prospect = kl_functions_user_has_role($user, ROLE_PROSPECT_NAME);
  93.    $user_is_animator = kl_functions_user_has_role($user, GROUP_ANIMATOR_NAME);
  94. -  $user_is_admin = kl_functions_user_has_role($user, ADMIN_NAME);
  95. +  $user_is_admin = kl_user_has_roles($user, KL_ROLE_ADMIN_RID);
  96.    if ($user_is_admin=="1") {
  97.      $user_admin=TRUE;
  98.    }
create a new version of this paste RAW Paste Data