/[drupal]/contributions/modules/demexp/demexp.module
ViewVC logotype

Diff of /contributions/modules/demexp/demexp.module

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.28, Sat Oct 14 11:15:55 2006 UTC revision 1.29, Sat Oct 14 12:02:13 2006 UTC
# Line 1  Line 1 
1  <?php  <?php
2  /*************************************  /*************************************
3   * Demexp module for a Drupal demexp client   * Demexp module for a Drupal demexp client
4   * $Id: demexp.module,v 1.27 2006/10/14 10:17:16 augustin Exp $   * $Id: demexp.module,v 1.28 2006/10/14 11:15:55 augustin Exp $
5   * Copyright Augustin Masquilier, 2006.   * Copyright Augustin Masquilier, 2006.
6   * This module is released under the terms of the GPL.   * This module is released under the terms of the GPL.
7   *************************************/   *************************************/
# Line 1063  function _demexp_check_login_status($use Line 1063  function _demexp_check_login_status($use
1063    $html = '';    $html = '';
1064    // 1- is this an anonymous user or a user registered and logged in the site?    // 1- is this an anonymous user or a user registered and logged in the site?
1065    // the admin user $uid == 1 is also excluded.    // the admin user $uid == 1 is also excluded.
1066    if ($user->uid < 2) {    if ($user->uid == 0) {
1067      $html .= t('<p class="marker">Please !register and !login to be able to vote (you will also need an official !demexp-account).</p>',      $html .= t('<p class="marker">Please !register and !login to be able to vote (you will also need an official !demexp-account).</p>',
1068        array('!register' => l(t('register'), 'user/register'),        array('!register' => l(t('register'), 'user/register'),
1069          '!login' => l(t('login'), 'user'),          '!login' => l(t('login'), 'user'),
1070          '!demexp-account' => l(t('demexp account'), 'http://www.demexp.org/fr/doku.php?id=instructions_de_demande_d_inscription')));          '!demexp-account' => l(t('demexp account'), 'http://www.demexp.org/fr/doku.php?id=instructions_de_demande_d_inscription')));
1071    }    }
1072      elseif ($user->uid == 1) {
1073        $html .= '<p">'. t('The web site administrator must use another, personal account to vote and create questions.') .'</p>';
1074      }
1075    // 2- If the username is empty AND the password is set, it is because the user has just requested a new account.    // 2- If the username is empty AND the password is set, it is because the user has just requested a new account.
1076    elseif (empty($user->ds_user_account) && $user->demexp_remember_password) {    elseif (empty($user->ds_user_account) && $user->demexp_remember_password) {
1077      $html .= '<p class="marker">'. t('Your request for an official demexp account is being processed. You should receive an email within a few days.') .'</p>';      $html .= '<p class="marker">'. t('Your request for an official demexp account is being processed. You should receive an email within a few days.') .'</p>';
Legend:
Removed from v.1.28  
changed lines
  Added in v.1.29
  ViewVC Help
Powered by ViewVC 1.1.2