Changeset 282

Show
Ignore:
Timestamp:
11/19/04 22:28:26 (4 years ago)
Author:
benoitg
Message:

2004-11-19 Benoit Gr�goire <bock@step.polymtl.ca>

  • TODO: Add email domains to blacklist
  • wifidog/config.php, wifidog/include/user_management_menu.php: Add tech support email address
  • wifidog/hotspot_status.php: List of HotSpots? that are open with summary of information. Designed to be included as part of another page.
  • wifidog/local_content/common/wifidog_logo_banner.gif: Add wifidog logo
  • wifidog/local_content/default/hotspot_logo_banner.jpg: Shrink the logo and write unknown hotspot, however this is still really ugly
  • wifidog/local_content/default/login.html, portal.html, stylesheet.css: Cosmetic fixes
    • wifidog/local_content/default/login.html.fr, portal.html.fr: Delete the files, this isn't the approach we will use for translation.
  • sql/wifidog-postgres-initial-data.sql, wifidog-postgres-schema.sql: Update with new node information structures.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wifidog-auth/ChangeLog

    r268 r282  
    11# $Header$ 
     22004-11-19 Benoit Gr�ire  <bock@step.polymtl.ca> 
     3        * TODO: Add email domains to blacklist 
     4        * wifidog/config.php, wifidog/include/user_management_menu.php: Add tech support email address 
     5        * wifidog/hotspot_status.php: List of HotSpots that are open with summary of information.  Designed to be included as part of another page. 
     6        * wifidog/local_content/common/wifidog_logo_banner.gif: Add wifidog logo 
     7        * wifidog/local_content/default/hotspot_logo_banner.jpg: Shrink the logo and write unknown hotspot, however this is still really ugly 
     8        * wifidog/local_content/default/login.html, portal.html, stylesheet.css: Cosmetic fixes 
     9        * wifidog/local_content/default/login.html.fr, portal.html.fr: Delete the files, this isn't the approach we will use for translation. 
     10        * sql/wifidog-postgres-initial-data.sql, wifidog-postgres-schema.sql: Update with new node information structures. 
     11 
    2122004-11-04 Benoit Gr�ire  <bock@step.polymtl.ca> 
    313        * wifidog/admin/hotspot_log.php: Add number of currently connected users here as well. 

  • trunk/wifidog-auth/TODO

    r158 r282  
    22-Node manager 
    33-User profile 
    4 -Link to original website requested (but don't log it).  
     4 
     5Blacklist emails: 
     6simplicato.net 
     7mytrashmail.com 
     8spamhole.com 
     9mailexpire.com 
     10sneakemail.com 
     11spamex.com 
     12emailias.com 
     13mymailoasis.com 
     14spamcon.org 
     15spamgourmet.com 
     16spammotel.com 

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

    r267 r282  
    2323INSERT INTO token_status (token_status) VALUES ('USED'); 
    2424 
     25INSERT INTO node_deployment_status (node_deployment_status) VALUES ('DEPLOYED'); 
     26INSERT INTO node_deployment_status (node_deployment_status) VALUES ('IN_PLANNING'); 
     27INSERT INTO node_deployment_status (node_deployment_status) VALUES ('IN_TESTING'); 
     28INSERT INTO node_deployment_status (node_deployment_status) VALUES ('NON_WIFIDOG_NODE'); 
     29INSERT INTO node_deployment_status (node_deployment_status) VALUES ('PERMANENTLY_CLOSED'); 
     30INSERT INTO node_deployment_status (node_deployment_status) VALUES ('TEMPORARILY_CLOSED'); 
    2531 
    2632INSERT INTO nodes (node_id, name, rss_url) VALUES ('default', 'Unknown node', NULL); 

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

    r267 r282  
    7777    home_page_url text, 
    7878    last_heartbeat_user_agent text, 
    79     description text 
     79    description text, 
     80    map_url text, 
     81    street_address text, 
     82    public_phone_number text, 
     83    public_email text, 
     84    mass_transit_info text, 
     85    node_deployment_status character varying(32) DEFAULT 'IN_PLANNING'::character varying NOT NULL 
    8086); 
    8187 
    …… 
    110116 
    111117-- 
    112 -- TOC entry 13 (OID 300919) 
     118-- TOC entry 10 (OID 318918) 
     119-- Name: node_deployment_status; Type: TABLE; Schema: public; Owner: wifidog 
     120-- 
     121 
     122CREATE TABLE node_deployment_status ( 
     123    node_deployment_status character varying(32) NOT NULL 
     124) WITHOUT OIDS; 
     125 
     126 
     127-- 
     128-- TOC entry 14 (OID 300919) 
    113129-- Name: idx_token; Type: INDEX; Schema: public; Owner: wifidog 
    114130-- 
    …… 
    118134 
    119135-- 
    120 -- TOC entry 14 (OID 300920) 
     136-- TOC entry 15 (OID 300920) 
    121137-- Name: idx_token_status_and_user_id; Type: INDEX; Schema: public; Owner: wifidog 
    122138-- 
    …… 
    126142 
    127143-- 
    128 -- TOC entry 10 (OID 299870) 
     144-- TOC entry 11 (OID 299870) 
    129145-- Name: administrators_pkey; Type: CONSTRAINT; Schema: public; Owner: wifidog 
    130146-- 
    …… 
    135151 
    136152-- 
    137 -- TOC entry 11 (OID 299874) 
     153-- TOC entry 12 (OID 299874) 
    138154-- Name: token_status_pkey; Type: CONSTRAINT; Schema: public; Owner: wifidog 
    139155-- 
    …… 
    144160 
    145161-- 
    146 -- TOC entry 12 (OID 299889) 
     162-- TOC entry 13 (OID 299889) 
    147163-- Name: connections_pkey; Type: CONSTRAINT; Schema: public; Owner: wifidog 
    148164-- 
    …… 
    153169 
    154170-- 
    155 -- TOC entry 15 (OID 299901) 
     171-- TOC entry 16 (OID 299901) 
    156172-- Name: nodes_pkey; Type: CONSTRAINT; Schema: public; Owner: wifidog 
    157173-- 
    …… 
    162178 
    163179-- 
    164 -- TOC entry 16 (OID 299912) 
     180-- TOC entry 17 (OID 299912) 
    165181-- Name: users_pkey; Type: CONSTRAINT; Schema: public; Owner: wifidog 
    166182-- 
    …… 
    171187 
    172188-- 
    173 -- TOC entry 17 (OID 310107) 
     189-- TOC entry 18 (OID 310107) 
    174190-- Name: node_owners_pkey; Type: CONSTRAINT; Schema: public; Owner: wifidog 
    175191-- 
    …… 
    180196 
    181197-- 
    182 -- TOC entry 19 (OID 299891) 
     198-- TOC entry 19 (OID 318920) 
     199-- Name: node_deployment_status_pkey; Type: CONSTRAINT; Schema: public; Owner: wifidog 
     200-- 
     201 
     202ALTER TABLE ONLY node_deployment_status 
     203    ADD CONSTRAINT node_deployment_status_pkey PRIMARY KEY (node_deployment_status); 
     204 
     205 
     206-- 
     207-- TOC entry 21 (OID 299891) 
    183208-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: wifidog 
    184209-- 
    …… 
    189214 
    190215-- 
    191 -- TOC entry 18 (OID 299914) 
     216-- TOC entry 20 (OID 299914) 
    192217-- Name: administrators_ibfk_1; Type: FK CONSTRAINT; Schema: public; Owner: wifidog 
    193218-- 
    …… 
    198223 
    199224-- 
    200 -- TOC entry 20 (OID 300909) 
     225-- TOC entry 22 (OID 300909) 
    201226-- Name: fk_users; Type: FK CONSTRAINT; Schema: public; Owner: wifidog 
    202227-- 
    …… 
    207232 
    208233-- 
    209 -- TOC entry 21 (OID 300913) 
     234-- TOC entry 23 (OID 300913) 
    210235-- Name: fk_nodes; Type: FK CONSTRAINT; Schema: public; Owner: wifidog 
    211236-- 
    …… 
    216241 
    217242-- 
    218 -- TOC entry 22 (OID 310097) 
     243-- TOC entry 25 (OID 310097) 
    219244-- Name: fk_users; Type: FK CONSTRAINT; Schema: public; Owner: wifidog 
    220245-- 
    …… 
    225250 
    226251-- 
    227 -- TOC entry 23 (OID 310101) 
     252-- TOC entry 26 (OID 310101) 
    228253-- Name: fk_nodes; Type: FK CONSTRAINT; Schema: public; Owner: wifidog 
    229254-- 
    …… 
    233258 
    234259 
     260-- 
     261-- TOC entry 24 (OID 318922) 
     262-- Name: fk_node_deployment_status; Type: FK CONSTRAINT; Schema: public; Owner: wifidog 
     263-- 
     264 
     265ALTER TABLE ONLY nodes 
     266    ADD CONSTRAINT fk_node_deployment_status FOREIGN KEY (node_deployment_status) REFERENCES node_deployment_status(node_deployment_status) ON UPDATE CASCADE ON DELETE RESTRICT; 
     267 
     268 

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

    r234 r282  
    77 * 
    88 *     $Log$ 
     9 *     Revision 1.12  2004/11/20 03:28:25  benoitg 
     10 *     2004-11-19 Benoit Gr�ire  <bock@step.polymtl.ca> 
     11 *      * TODO: Add email domains to blacklist 
     12 *      * wifidog/config.php, wifidog/include/user_management_menu.php: Add tech support email address 
     13 *      * wifidog/hotspot_status.php: List of HotSpots that are open with summary of information.  Designed to be included as part of another page. 
     14 *      * wifidog/local_content/common/wifidog_logo_banner.gif: Add wifidog logo 
     15 *      * wifidog/local_content/default/hotspot_logo_banner.jpg: Shrink the logo and write unknown hotspot, however this is still really ugly 
     16 *      * wifidog/local_content/default/login.html, portal.html, stylesheet.css: Cosmetic fixes 
     17 *              * wifidog/local_content/default/login.html.fr, portal.html.fr: Delete the files, this isn't the approach we will use for translation. 
     18 *      * sql/wifidog-postgres-initial-data.sql, wifidog-postgres-schema.sql: Update with new node information structures. 
     19 * 
    920 *     Revision 1.11  2004/09/28 20:46:40  yanik_crepeau 
    1021 *     Added experimental (and commented) code for next developpments 
    …… 
    3142define('HOTSPOT_NETWORK_NAME', '�e sans fil'); 
    3243define('HOTSPOT_NETWORK_URL', 'http://www.ilesansfil.org/'); 
     44define('TECH_SUPPORT_EMAIL', 'tech@ilesansfil.org'); 
    3345define('UNKNOWN_HOSTPOT_NAME', 'Unknown HotSpot'); 
    3446 

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

    r227 r282  
    4040  $retval .= "</ul>\n"; 
    4141  $retval .= "<p class='sidenote'>Accounts on ".HOTSPOT_NETWORK_NAME." are <emp>totally free</emp>, use the left menu to create a new one or recover a lost username or password.</p>\n"; 
     42  $retval .= "<p class='sidenote'>Please report any problem or interruption in our service to: <a href='".TECH_SUPPORT_EMAIL."'>".TECH_SUPPORT_EMAIL."</a></p>\n"; 
    4243  //$retval .= "</div>\n"; 
    4344  return $retval; 

  • trunk/wifidog-auth/wifidog/local_content/default/login.html

    r228 r282  
    33 
    44      <div id='head'> 
    5         <h1>Greetings! Welcome to {$hotspot_name}, a {$hotspot_network_name} free HotSpot 
    6         </h1> 
     5        <h1>Greetings! Welcome to {$hotspot_name}, a {$hotspot_network_name} free HotSpot</h1> 
    76        </div> 
    87 
    …… 
    2625      </div> 
    2726      <div id="content"> 
     27      <h2>Announcements</h2> 
     28  <dl> 
     29  <dt>16/11/2004: <a href='http://auth.ilesansfil.org/phpsurveyor/index.php?sid=3'>Sondage pour les usagers</a> / <a href='http://auth.ilesansfil.org/phpsurveyor/index.php?sid=2'>User survey</a></dt> 
     30  <dd>Aidez les b�voles d'� sans fil �ous offrir un meilleur service en remplissant notre sondage. / Please help our volunteers support you by filling our survey.</dd> 
     31  </dl> 
     32  <dl> 
     33  <dt>15/11/2004: Ouvert �ous: <a href='http://www.ilesansfil.org/wiki/Events_2f2004_2d11_2d20'>Journ�de formation le 20 novembre</a>.</dt> 
     34  <dd>Vous appr�ez notre projet et vous souhaitez nous aider �uvrir plus de HotSpots? C'est votre chance d'apprendre comment faire...</dd>  
     35  </dl> 
     36 
     37 
    2838 
    2939<div class="logos"> 
    30 <img src='{$network_logo_url}' alt='{$hotspot_network_name} logo' /><br /> 
    31 <img src='{$wifidog_logo_url}' alt='WifiDog logo' />   
     40<img src="{$network_logo_url}" alt="{$hotspot_network_name} logo" /><br /> 
     41<img src="{$wifidog_logo_url}" alt="WifiDog logo" />   
    3242</div> 
    33 <img src='{$hotspot_logo_url}' alt='{$hotspot_name} logo' /> 
     43<img src="{$hotspot_logo_url}" alt="{$hotspot_name} logo"  class="hotspot" /> 
    3444 
    35         <h2>Announcements</h2> 
    36           <dl> 
    37           <dt>31/9/2004: {$hotspot_network_name} is currently transitioning from NoCat to the brand new Wifidog captive portal.  Please note that your previous username and password should still work.</dt>  
    38           </dl> 
    3945</div> 
    4046 

  • trunk/wifidog-auth/wifidog/local_content/default/portal.html

    r230 r282  
    1818      <div id='content'> 
    1919       
    20         <p><a href='{$hotspot_network_url}'><img src='{$network_logo_banner_url}' alt='{$hotspot_network_name} logo'></a></p> 
     20        <p><a href='{$hotspot_network_url}'><img src='{$network_logo_banner_url}' alt='{$hotspot_network_name} logo' border='0'></a></p> 
    2121        <p>Content from "<a href='{$hotspot_network_url}'>{$hotspot_network_name}</a>"</p> 
    2222        {$network_rss_html} 

  • trunk/wifidog-auth/wifidog/local_content/default/stylesheet.css

    r227 r282  
    2929 
    3030h2 { 
    31   clear: both; 
     31  /*clear: both;*/ 
    3232  border-bottom: 1px solid #BFDCB5; 
    3333  color: #628C53;