Show
Ignore:
Timestamp:
09/06/06 09:01:54 (7 years ago)
Author:
benoitg
Message:

filter content type according to various criteria. Will be used more
extensively in the profile manager.

  • Content manager: Use content type filter to only allow Simple

content types (Content without metadata) to be used for metadata.

banner adds, or any other image rotation. Size constraints not yet
implemented

  • Move externally maintained class.phpmailer.php, class.smtp.php

into lib where they belong

  • DateTime?.php: Make class handle an empty date sensibly.
  • Network.php: Show the network again when there is only one.

It was confusing in some screens.

  • page.php: Clarify error message, and set a more reasonnable

paging cascade:

5 min, 30 min, 2 hours, 1 day, 1 week, 1 month

  • Finally fix #127
  • At last, working content scheduled display and expiration for

ContentGroups?. Archiving does not yet have a UI. Content that expires
will simply seem to disapear.

  • Fix #247 (somebody filed a bug before I commited, conveniently

saving me the need to describe it).

  • The Fix for #106 in [1089] returned non-objects, causing error

messages and not displaying what it was meant to display.

Used Guest instead of Annonymous, which will probably be

used for different purpose in the future.

This re-fix does not include duplicate counting yet.

Splash users are not the only users that could log-in multiple times.

I don't have a staging server here, a fix will be

commited in a few minutes if something goes wrong.

  • Cleanup coments.
  • Sync schemas
Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/wifidog-auth/sql/wifidog-postgres-schema.sql

    r1024 r1090  
    7373    description text, 
    7474    project_info text, 
    75     sponsor_info text, 
    7675    creation_timestamp timestamp without time zone DEFAULT now(), 
    7776    is_persistent boolean DEFAULT false, 
    7877    long_description text, 
     78    title_is_displayed boolean DEFAULT true NOT NULL, 
    7979    CONSTRAINT content_type_not_empty_string CHECK ((content_type <> ''::text)) 
    8080); 
    8181 
    82  
    83 SET default_with_oids = false; 
    8482 
    8583-- 
     
    9290 
    9391 
    94 SET default_with_oids = true; 
    95  
    9692-- 
    9793-- Name: content_available_display_pages; Type: TABLE; Schema: public; Owner: wifidog; Tablespace:  
     
    10298); 
    10399 
     100 
     101SET default_with_oids = false; 
     102 
     103-- 
     104-- Name: content_clickthrough_log; Type: TABLE; Schema: public; Owner: wifidog; Tablespace:  
     105-- 
     106 
     107CREATE TABLE content_clickthrough_log ( 
     108    user_id text, 
     109    content_id text NOT NULL, 
     110    clickthrough_timestamp timestamp without time zone DEFAULT now() NOT NULL, 
     111    node_id text NOT NULL, 
     112    destination_url text NOT NULL, 
     113    CONSTRAINT content_clickthrough_log_destination_url_check CHECK ((destination_url <> ''::text)) 
     114); 
     115 
     116 
     117SET default_with_oids = true; 
    104118 
    105119-- 
     
    140154    url text, 
    141155    data_blob oid, 
    142     local_binary_size bigint 
     156    local_binary_size bigint, 
     157    creation_date timestamp without time zone DEFAULT now(), 
     158    last_update_date timestamp without time zone DEFAULT now() 
    143159); 
    144160 
     
    151167    pictures_id text NOT NULL, 
    152168    width integer, 
    153     height integer 
     169    height integer, 
     170    hyperlink_url text 
    154171); 
    155172 
     
    209226    display_order integer DEFAULT 1, 
    210227    displayed_content_id text, 
    211     force_only_allowed_node boolean 
     228    force_only_allowed_node boolean, 
     229    valid_from_timestamp timestamp without time zone, 
     230    valid_until_timestamp timestamp without time zone 
    212231); 
    213232 
     
    342361    gmaps_initial_zoom_level integer, 
    343362    gmaps_map_type text DEFAULT 'G_NORMAL_MAP'::text NOT NULL, 
    344     CONSTRAINT networks_gmaps_map_type_check CHECK ((gmaps_map_type <> ''::text)), 
     363    theme_pack text, 
     364    CONSTRAINT networks_gmaps_map_type CHECK ((gmaps_map_type <> ''::text)), 
    345365    CONSTRAINT networks_name CHECK ((name <> ''::text)), 
    346366    CONSTRAINT networks_network_authenticator_class CHECK ((network_authenticator_class <> ''::text)), 
     
    435455 
    436456 
    437 SET default_with_oids = false; 
    438  
    439457-- 
    440458-- Name: servers; Type: TABLE; Schema: public; Owner: wifidog; Tablespace:  
     
    449467    ssl_available boolean DEFAULT false NOT NULL, 
    450468    gmaps_api_key text, 
    451     CONSTRAINT servers_name_check CHECK ((name <> ''::text)), 
    452     CONSTRAINT servers_name_check1 CHECK ((name <> ''::text)) 
    453 ); 
    454  
    455  
    456 SET default_with_oids = true; 
     469    CONSTRAINT servers_hostname CHECK ((name <> ''::text)), 
     470    CONSTRAINT servers_name CHECK ((name <> ''::text)) 
     471); 
     472 
    457473 
    458474-- 
     
    493509    website text, 
    494510    prefered_locale text, 
    495     CONSTRAINT check_account_origin_not_empty CHECK ((account_origin <> ''::text)), 
    496511    CONSTRAINT check_user_not_empty CHECK (((user_id)::text <> ''::text)) 
    497512); 
     
    796811 
    797812-- 
     813-- Name: idx_content_group_element_valid_from_timestamp; Type: INDEX; Schema: public; Owner: wifidog; Tablespace:  
     814-- 
     815 
     816CREATE INDEX idx_content_group_element_valid_from_timestamp ON content_group_element USING btree (valid_from_timestamp); 
     817 
     818 
     819-- 
     820-- Name: idx_content_group_element_valid_until_timestamp; Type: INDEX; Schema: public; Owner: wifidog; Tablespace:  
     821-- 
     822 
     823CREATE INDEX idx_content_group_element_valid_until_timestamp ON content_group_element USING btree (valid_until_timestamp); 
     824 
     825 
     826-- 
    798827-- Name: idx_token; Type: INDEX; Schema: public; Owner: wifidog; Tablespace:  
    799828-- 
     
    945974 
    946975-- 
    947 -- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: wifidog 
    948 -- 
    949  
    950 ALTER TABLE ONLY network_stakeholders 
    951     ADD CONSTRAINT "$1" FOREIGN KEY (network_id) REFERENCES networks(network_id); 
    952  
    953  
    954 -- 
    955976-- Name: $2; Type: FK CONSTRAINT; Schema: public; Owner: wifidog 
    956977-- 
     
    10201041-- 
    10211042 
    1022 ALTER TABLE ONLY node_stakeholders 
    1023     ADD CONSTRAINT "$2" FOREIGN KEY (user_id) REFERENCES users(user_id); 
    1024  
    1025  
    1026 -- 
    1027 -- Name: $2; Type: FK CONSTRAINT; Schema: public; Owner: wifidog 
    1028 -- 
    1029  
    1030 ALTER TABLE ONLY network_stakeholders 
    1031     ADD CONSTRAINT "$2" FOREIGN KEY (user_id) REFERENCES users(user_id); 
     1043ALTER TABLE ONLY network_has_content 
     1044    ADD CONSTRAINT "$2" FOREIGN KEY (display_area) REFERENCES content_available_display_areas(display_area) ON UPDATE CASCADE ON DELETE CASCADE; 
    10321045 
    10331046 
     
    10571070 
    10581071-- 
    1059 -- Name: $4; Type: FK CONSTRAINT; Schema: public; Owner: wifidog 
    1060 -- 
    1061  
    1062 ALTER TABLE ONLY content 
    1063     ADD CONSTRAINT "$4" FOREIGN KEY (sponsor_info) REFERENCES content(content_id) ON UPDATE CASCADE ON DELETE RESTRICT; 
     1072-- Name: $3; Type: FK CONSTRAINT; Schema: public; Owner: wifidog 
     1073-- 
     1074 
     1075ALTER TABLE ONLY node_has_content 
     1076    ADD CONSTRAINT "$3" FOREIGN KEY (display_area) REFERENCES content_available_display_areas(display_area) ON UPDATE CASCADE ON DELETE CASCADE; 
    10641077 
    10651078 
     
    10771090 
    10781091ALTER TABLE ONLY users 
    1079     ADD CONSTRAINT account_origin_fkey FOREIGN KEY (account_origin) REFERENCES networks(network_id) ON UPDATE CASCADE ON DELETE RESTRICT; 
     1092    ADD CONSTRAINT account_origin_fkey FOREIGN KEY (account_origin) REFERENCES networks(network_id) ON UPDATE CASCADE ON DELETE CASCADE; 
    10801093 
    10811094 
     
    10891102 
    10901103-- 
     1104-- Name: content_clickthrough_log_content_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: wifidog 
     1105-- 
     1106 
     1107ALTER TABLE ONLY content_clickthrough_log 
     1108    ADD CONSTRAINT content_clickthrough_log_content_id_fkey FOREIGN KEY (content_id) REFERENCES content(content_id) ON UPDATE CASCADE ON DELETE CASCADE; 
     1109 
     1110 
     1111-- 
     1112-- Name: content_clickthrough_log_node_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: wifidog 
     1113-- 
     1114 
     1115ALTER TABLE ONLY content_clickthrough_log 
     1116    ADD CONSTRAINT content_clickthrough_log_node_id_fkey FOREIGN KEY (node_id) REFERENCES nodes(node_id) ON UPDATE CASCADE ON DELETE CASCADE; 
     1117 
     1118 
     1119-- 
     1120-- Name: content_clickthrough_log_user_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: wifidog 
     1121-- 
     1122 
     1123ALTER TABLE ONLY content_clickthrough_log 
     1124    ADD CONSTRAINT content_clickthrough_log_user_id_fkey FOREIGN KEY (user_id) REFERENCES users(user_id) ON UPDATE CASCADE ON DELETE CASCADE; 
     1125 
     1126 
     1127-- 
    10911128-- Name: display_location_fkey; Type: FK CONSTRAINT; Schema: public; Owner: wifidog 
    10921129-- 
     
    11051142 
    11061143-- 
     1144-- Name: fk_network; Type: FK CONSTRAINT; Schema: public; Owner: wifidog 
     1145-- 
     1146 
     1147ALTER TABLE ONLY network_stakeholders 
     1148    ADD CONSTRAINT fk_network FOREIGN KEY (network_id) REFERENCES networks(network_id) ON UPDATE CASCADE ON DELETE CASCADE; 
     1149 
     1150 
     1151-- 
    11071152-- Name: fk_node_deployment_status; Type: FK CONSTRAINT; Schema: public; Owner: wifidog 
    11081153-- 
     
    11171162 
    11181163ALTER TABLE ONLY connections 
    1119     ADD CONSTRAINT fk_nodes FOREIGN KEY (node_id) REFERENCES nodes(node_id) ON UPDATE CASCADE ON DELETE RESTRICT; 
     1164    ADD CONSTRAINT fk_nodes FOREIGN KEY (node_id) REFERENCES nodes(node_id) ON UPDATE CASCADE ON DELETE CASCADE; 
    11201165 
    11211166 
     
    11251170 
    11261171ALTER TABLE ONLY connections 
    1127     ADD CONSTRAINT fk_users FOREIGN KEY (user_id) REFERENCES users(user_id) ON UPDATE CASCADE ON DELETE RESTRICT; 
     1172    ADD CONSTRAINT fk_users FOREIGN KEY (user_id) REFERENCES users(user_id) ON UPDATE CASCADE ON DELETE CASCADE; 
     1173 
     1174 
     1175-- 
     1176-- Name: fk_users; Type: FK CONSTRAINT; Schema: public; Owner: wifidog 
     1177-- 
     1178 
     1179ALTER TABLE ONLY node_stakeholders 
     1180    ADD CONSTRAINT fk_users FOREIGN KEY (user_id) REFERENCES users(user_id) ON UPDATE CASCADE ON DELETE CASCADE; 
     1181 
     1182 
     1183-- 
     1184-- Name: fk_users; Type: FK CONSTRAINT; Schema: public; Owner: wifidog 
     1185-- 
     1186 
     1187ALTER TABLE ONLY network_stakeholders 
     1188    ADD CONSTRAINT fk_users FOREIGN KEY (user_id) REFERENCES users(user_id) ON UPDATE CASCADE ON DELETE CASCADE; 
    11281189 
    11291190 
     
    11451206 
    11461207-- 
    1147 -- Name: network_has_content_display_area_fkey; Type: FK CONSTRAINT; Schema: public; Owner: wifidog 
    1148 -- 
    1149  
    1150 ALTER TABLE ONLY network_has_content 
    1151     ADD CONSTRAINT network_has_content_display_area_fkey FOREIGN KEY (display_area) REFERENCES content_available_display_areas(display_area) ON UPDATE CASCADE ON DELETE CASCADE; 
    1152  
    1153  
    1154 -- 
    1155 -- Name: network_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: wifidog 
    1156 -- 
    1157  
    1158 ALTER TABLE ONLY nodes 
    1159     ADD CONSTRAINT network_id_fkey FOREIGN KEY (network_id) REFERENCES networks(network_id) ON UPDATE CASCADE ON DELETE RESTRICT; 
    1160  
    1161  
    1162 -- 
    11631208-- Name: network_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: wifidog 
    11641209-- 
     
    11691214 
    11701215-- 
    1171 -- Name: node_has_content_display_area_fkey; Type: FK CONSTRAINT; Schema: public; Owner: wifidog 
    1172 -- 
    1173  
    1174 ALTER TABLE ONLY node_has_content 
    1175     ADD CONSTRAINT node_has_content_display_area_fkey FOREIGN KEY (display_area) REFERENCES content_available_display_areas(display_area) ON UPDATE CASCADE ON DELETE CASCADE; 
     1216-- Name: network_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: wifidog 
     1217-- 
     1218 
     1219ALTER TABLE ONLY nodes 
     1220    ADD CONSTRAINT network_id_fkey FOREIGN KEY (network_id) REFERENCES networks(network_id) ON UPDATE CASCADE ON DELETE CASCADE; 
    11761221 
    11771222