Changeset 523

Show
Ignore:
Timestamp:
03/31/05 21:05:33 (8 years ago)
Author:
benoitg
Message:

2005-03-31 Benoit Gr�goire <bock@…>

  • Remove spaces after php blocks in various files.
  • Temporarely fix single authentication source not present bug in login smarty template. All other places where we select the network will be fixed tommorow.
  • Fix initial schema errors.
Location:
trunk/wifidog-auth
Files:
13 modified

Legend:

Unmodified
Added
Removed

  • trunk/wifidog-auth/ChangeLog

    r522 r523  
     12005-03-31 Benoit Gr�goire  <bock@step.polymtl.ca> 
     2        * Remove spaces after php blocks in various files. 
     3        * Temporarely fix single authentication source not present bug in login smarty template.  All other places where we select the network will be fixed tommorow. 
     4        * Fix initial schema errors. 
     5         
    162005-03-31 Benoit Gr�goire  <bock@step.polymtl.ca> 
    27        * More RADIUS install documentation. 

  • trunk/wifidog-auth/INSTALL

    r522 r523  
    6464automatically: 
    6565 
    66 pear install Auth 
    6766pear install radius   ( PECL module compilation) 
    6867pear install Auth_RADIUS 

  • trunk/wifidog-auth/sql/dump_initial_data_postgres.sh

    r514 r523  
    44 
    55echo "--- The default admin user, delete or change password as soon as possible.  The password is admin " 
    6 echo "INSERT INTO users (user_id, username, pass, email, account_status) VALUES ('admin_original_user_delete_me', 'admin', 'ISMvKXpXpadDiUoOSoAfww==', 'test_user_please@delete.me', 1, 'df16cc4b1d0975e267f3425eaac31950');"; 
     6echo "INSERT INTO users (user_id, username, pass, email, account_status, validation_token) VALUES ('admin_original_user_delete_me', 'admin', 'ISMvKXpXpadDiUoOSoAfww==', 'test_user_please@delete.me', 1, 'df16cc4b1d0975e267f3425eaac31950');"; 
    77 
    88echo "INSERT INTO administrators (user_id) VALUES ('admin_original_user_delete_me');" 
    … …  
    1010pg_dump -a -D --username=wifidog -t token_status 
    1111 
     12pg_dump -a -D --username=wifidog -t venue_types 
     13pg_dump -a -D --username=wifidog -t node_deployment_status 
    1214echo "INSERT INTO nodes (node_id, name, rss_url) VALUES ('default', 'Unknown node', NULL);" 
    1315 
    14 pg_dump -a -D --username=wifidog -t node_deployment_status 
    15 pg_dump -a -D --username=wifidog -t venue_types 
    1616pg_dump -a -D --username=wifidog -t schema_info 
    1717 

  • trunk/wifidog-auth/sql/sync_sql_for_cvs.sh

    r223 r523  
    11#!/bin/sh 
    2 echo "Note:  This script must be run as the wifidog local user" 
     2echo "Note:  When prompted for a password, enter the wifidog database user's password" 
    33sh dump_initial_data_postgres.sh > wifidog-postgres-initial-data.sql 
    44chmod a+r wifidog-postgres-initial-data.sql 

  • trunk/wifidog-auth/sql/wifidog-postgres-initial-data.sql

    r514 r523  
    22BEGIN; 
    33--- The default admin user, delete or change password as soon as possible.  The password is admin  
    4 INSERT INTO users (user_id, username, pass, email, account_status) VALUES ('admin_original_user_delete_me', 'admin', 'ISMvKXpXpadDiUoOSoAfww==', 'test_user_please@delete.me', 1, 'df16cc4b1d0975e267f3425eaac31950'); 
     4INSERT INTO users (user_id, username, pass, email, account_status, validation_token) VALUES ('admin_original_user_delete_me', 'admin', 'ISMvKXpXpadDiUoOSoAfww==', 'test_user_please@delete.me', 1, 'df16cc4b1d0975e267f3425eaac31950'); 
    55INSERT INTO administrators (user_id) VALUES ('admin_original_user_delete_me'); 
    66-- 
    … …  
    2323INSERT INTO token_status (token_status) VALUES ('INUSE'); 
    2424INSERT INTO token_status (token_status) VALUES ('USED'); 
    25  
    26  
    27 INSERT INTO nodes (node_id, name, rss_url) VALUES ('default', 'Unknown node', NULL); 
    28 -- 
    29 -- PostgreSQL database dump 
    30 -- 
    31  
    32 SET client_encoding = 'LATIN1'; 
    33 SET check_function_bodies = false; 
    34  
    35 SET SESSION AUTHORIZATION 'wifidog'; 
    36  
    37 SET search_path = public, pg_catalog; 
    38  
    39 -- 
    40 -- Data for TOC entry 2 (OID 115973) 
    41 -- Name: node_deployment_status; Type: TABLE DATA; Schema: public; Owner: wifidog 
    42 -- 
    43  
    44 INSERT INTO node_deployment_status (node_deployment_status) VALUES ('DEPLOYED'); 
    45 INSERT INTO node_deployment_status (node_deployment_status) VALUES ('IN_PLANNING'); 
    46 INSERT INTO node_deployment_status (node_deployment_status) VALUES ('IN_TESTING'); 
    47 INSERT INTO node_deployment_status (node_deployment_status) VALUES ('NON_WIFIDOG_NODE'); 
    48 INSERT INTO node_deployment_status (node_deployment_status) VALUES ('PERMANENTLY_CLOSED'); 
    49 INSERT INTO node_deployment_status (node_deployment_status) VALUES ('TEMPORARILY_CLOSED'); 
    5025 
    5126 
    … …  
    11489 
    11590-- 
     91-- Data for TOC entry 2 (OID 115973) 
     92-- Name: node_deployment_status; Type: TABLE DATA; Schema: public; Owner: wifidog 
     93-- 
     94 
     95INSERT INTO node_deployment_status (node_deployment_status) VALUES ('DEPLOYED'); 
     96INSERT INTO node_deployment_status (node_deployment_status) VALUES ('IN_PLANNING'); 
     97INSERT INTO node_deployment_status (node_deployment_status) VALUES ('IN_TESTING'); 
     98INSERT INTO node_deployment_status (node_deployment_status) VALUES ('NON_WIFIDOG_NODE'); 
     99INSERT INTO node_deployment_status (node_deployment_status) VALUES ('PERMANENTLY_CLOSED'); 
     100INSERT INTO node_deployment_status (node_deployment_status) VALUES ('TEMPORARILY_CLOSED'); 
     101 
     102 
     103INSERT INTO nodes (node_id, name, rss_url) VALUES ('default', 'Unknown node', NULL); 
     104-- 
     105-- PostgreSQL database dump 
     106-- 
     107 
     108SET client_encoding = 'LATIN1'; 
     109SET check_function_bodies = false; 
     110 
     111SET SESSION AUTHORIZATION 'wifidog'; 
     112 
     113SET search_path = public, pg_catalog; 
     114 
     115-- 
    116116-- Data for TOC entry 2 (OID 115985) 
    117117-- Name: schema_info; Type: TABLE DATA; Schema: public; Owner: wifidog 
    118118-- 
    119119 
    120 INSERT INTO schema_info (tag, value) VALUES ('schema_version', '2'); 
     120INSERT INTO schema_info (tag, value) VALUES ('schema_version', '3'); 
    121121 
    122122 

  • trunk/wifidog-auth/sql/wifidog-postgres-schema.sql

    r514 r523  
    102102    username text, 
    103103    account_origin text, 
    104     CONSTRAINT check_email_not_empty CHECK (((email)::text <> ''::text)), 
    105104    CONSTRAINT check_user_not_empty CHECK (((user_id)::text <> ''::text)) 
    106105); 
    … …  
    177176 
    178177-- 
    179 -- TOC entry 22 (OID 133192) 
     178-- TOC entry 21 (OID 133192) 
    180179-- Name: idx_unique_username_and_account_origin; Type: INDEX; Schema: public; Owner: wifidog 
    181180-- 
    182181 
    183182CREATE UNIQUE INDEX idx_unique_username_and_account_origin ON users USING btree (username, account_origin); 
    184  
    185  
    186 -- 
    187 -- TOC entry 21 (OID 140367) 
    188 -- Name: idx_unique_email_and_account_origin; Type: INDEX; Schema: public; Owner: wifidog 
    189 -- 
    190  
    191 CREATE UNIQUE INDEX idx_unique_email_and_account_origin ON users USING btree (email, account_origin); 
    192183 
    193184 
    … …  
    229220 
    230221-- 
    231 -- TOC entry 23 (OID 133114) 
     222-- TOC entry 22 (OID 133114) 
    232223-- Name: users_pkey; Type: CONSTRAINT; Schema: public; Owner: wifidog 
    233224-- 
    … …  
    238229 
    239230-- 
    240 -- TOC entry 24 (OID 133116) 
     231-- TOC entry 23 (OID 133116) 
    241232-- Name: node_owners_pkey; Type: CONSTRAINT; Schema: public; Owner: wifidog 
    242233-- 
    … …  
    247238 
    248239-- 
    249 -- TOC entry 25 (OID 133118) 
     240-- TOC entry 24 (OID 133118) 
    250241-- Name: node_deployment_status_pkey; Type: CONSTRAINT; Schema: public; Owner: wifidog 
    251242-- 
    … …  
    256247 
    257248-- 
    258 -- TOC entry 26 (OID 133120) 
     249-- TOC entry 25 (OID 133120) 
    259250-- Name: venue_types_pkey; Type: CONSTRAINT; Schema: public; Owner: wifidog 
    260251-- 
    … …  
    265256 
    266257-- 
    267 -- TOC entry 27 (OID 133122) 
     258-- TOC entry 26 (OID 133122) 
    268259-- Name: schema_info_pkey; Type: CONSTRAINT; Schema: public; Owner: wifidog 
    269260-- 
    … …  
    274265 
    275266-- 
    276 -- TOC entry 29 (OID 133124) 
     267-- TOC entry 28 (OID 133124) 
    277268-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: wifidog 
    278269-- 
    … …  
    283274 
    284275-- 
    285 -- TOC entry 28 (OID 133128) 
     276-- TOC entry 27 (OID 133128) 
    286277-- Name: administrators_ibfk_1; Type: FK CONSTRAINT; Schema: public; Owner: wifidog 
    287278-- 
    … …  
    292283 
    293284-- 
    294 -- TOC entry 30 (OID 133132) 
     285-- TOC entry 29 (OID 133132) 
    295286-- Name: fk_users; Type: FK CONSTRAINT; Schema: public; Owner: wifidog 
    296287-- 
    … …  
    301292 
    302293-- 
    303 -- TOC entry 31 (OID 133136) 
     294-- TOC entry 30 (OID 133136) 
    304295-- Name: fk_nodes; Type: FK CONSTRAINT; Schema: public; Owner: wifidog 
    305296-- 
    … …  
    310301 
    311302-- 
    312 -- TOC entry 34 (OID 133140) 
     303-- TOC entry 33 (OID 133140) 
    313304-- Name: fk_users; Type: FK CONSTRAINT; Schema: public; Owner: wifidog 
    314305-- 
    … …  
    319310 
    320311-- 
    321 -- TOC entry 35 (OID 133144) 
     312-- TOC entry 34 (OID 133144) 
    322313-- Name: fk_nodes; Type: FK CONSTRAINT; Schema: public; Owner: wifidog 
    323314-- 
    … …  
    328319 
    329320-- 
    330 -- TOC entry 32 (OID 133148) 
     321-- TOC entry 31 (OID 133148) 
    331322-- Name: fk_node_deployment_status; Type: FK CONSTRAINT; Schema: public; Owner: wifidog 
    332323-- 
    … …  
    337328 
    338329-- 
    339 -- TOC entry 33 (OID 133152) 
     330-- TOC entry 32 (OID 133152) 
    340331-- Name: fk_venue_types; Type: FK CONSTRAINT; Schema: public; Owner: wifidog 
    341332-- 

  • trunk/wifidog-auth/wifidog/classes/Authenticator.php

    r517 r523  
    11<?php 
    2  
    3  
    42/********************************************************************\ 
    53 * This program is free software; you can redistribute it and/or    * 
    … …  
    8987} // End class 
    9088?> 
    91  
    92  

  • trunk/wifidog-auth/wifidog/classes/AuthenticatorRadius.php

    r517 r523  
    11<?php 
    2  
    3  
    42/********************************************************************\ 
    53 * This program is free software; you can redistribute it and/or    * 

  • trunk/wifidog-auth/wifidog/classes/User.php

    r521 r523  
    11<?php 
    2  
    3  
    42/********************************************************************\ 
    53 * This program is free software; you can redistribute it and/or    * 
    … …  
    454452} // End class 
    455453?> 
    456  
    457  
    458  
    459  

  • trunk/wifidog-auth/wifidog/config.php

    r522 r523  
    77 * 
    88 *     $Log$ 
     9 *     Revision 1.27  2005/04/01 02:05:32  benoitg 
     10 *     2005-03-31 Benoit Gr�goire  <bock@step.polymtl.ca> 
     11 *      * Remove spaces after php blocks in various files. 
     12 *      * Temporarely fix single authentication source not present bug in login smarty template.  All other places where we select the network will be fixed tommorow. 
     13 *      * Fix initial schema errors. 
     14 * 
    915 *     Revision 1.26  2005/03/31 18:35:23  benoitg 
    1016 *     2005-03-31 Benoit Gr�goire  <bock@step.polymtl.ca> 
    … …  
    188194// RADIUS authenticators ( see AuthenticatorRadius constuctor doc for details ) 
    189195 
    190 require_once BASEPATH.'classes/AuthenticatorRadius.php'; 
     196/*require_once BASEPATH.'classes/AuthenticatorRadius.php'; 
    191197 
    192198define('IDRC_ACCOUNT_ORIGIN', 'IDRC_RADIUS_USER'); 
    … …  
    194200                             'name'=>"IDRC RADIUS Server test", 
    195201                             'authenticator'=>new AuthenticatorRadius(IDRC_ACCOUNT_ORIGIN, "192.168.0.11", 1812, 1813, "secret_key", "CHAP_MD5")); 
    196  
     202*/ 
    197203/*These are the file names of the different templates that can be put in the CONTENT_PATH/(node_id)/ folders */ 
    198204define('STYLESHEET_NAME', 'stylesheet.css'); 

  • trunk/wifidog-auth/wifidog/include/schema_validate.php

    r522 r523  
    11<?php 
    2  
    32/********************************************************************\ 
    43 * This program is free software; you can redistribute it and/or    * 
    … …  
    109108} 
    110109?> 
    111  

  • trunk/wifidog-auth/wifidog/templates/login.html

    r517 r523  
    1111            <input type="hidden" name="gw_id" value="{$gw_id}"> 
    1212        <table> 
    13         {if count($auth_sources) > 1} 
     13 
    1414        <tr> 
    1515                <td>{"Network"|_}:</td> 
    … …  
    2626                </td> 
    2727        </tr> 
    28         {/if} 
     28 
    2929        <tr> 
    3030            <td>{"Username (or email)"|_}:</td> 

  • trunk/wifidog-auth/wifidog/templates/login_virtual.html

    r517 r523  
    99        <form name="login_form" method="post"> 
    1010        <table> 
    11         {if count($auth_sources) > 1} 
     11 
    1212        <tr> 
    1313                <td>{"Network"|_}:</td> 
    … …  
    2424                </td> 
    2525        </tr> 
    26         {/if} 
     26 
    2727        <tr> 
    2828            <td>{"Username (or email)"|_}:</td>