Changeset 299
- Timestamp:
- 12/08/04 19:44:59 (4 years ago)
- Files:
-
- trunk/wifidog-auth/ChangeLog (modified) (1 diff)
- trunk/wifidog-auth/wifidog/include/user_management_menu.php (modified) (1 diff)
- trunk/wifidog-auth/wifidog/index.php (modified) (1 diff)
- trunk/wifidog-auth/wifidog/portal/index.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/wifidog-auth/ChangeLog
r296 r299 1 1 # $Header$ 2 3 2004-12-08 Benoit Gr�ire <bock@step.polymtl.ca> 4 * wifidog/index.php: Add menu 5 * wifidog/include/user_management_menu.php: Editorial change, make translateable 6 * wifidog/portal/index.php: Fix RSS feeds 7 2 8 2004-12-03 Benoit Gr�ire <bock@step.polymtl.ca> 3 9 * wifidog/admin/user_stats.php, wifidog/classes/Statistics.php: Embryonic aggregate user stats. Currently allows you to find out the rate at which your users subscribe. trunk/wifidog-auth/wifidog/include/user_management_menu.php
r296 r299 43 43 44 44 $retval .= "</ul>\n"; 45 $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";46 $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";45 $retval .= "<p class='sidenote'>"._("Accounts on ".HOTSPOT_NETWORK_NAME." are and will remain <emp>totally free</emp>, use the left menu to create a new one or recover a lost username or password.")."</p>\n"; 46 $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"; 47 47 //$retval .= "</div>\n"; 48 48 return $retval; trunk/wifidog-auth/wifidog/index.php
r296 r299 27 27 require_once BASEPATH.'classes/Style.php'; 28 28 require_once BASEPATH.'classes/Statistics.php'; 29 require_once (BASEPATH.'include/user_management_menu.php'); 29 30 30 31 $style = new Style(); 31 32 echo $style->GetHeader(HOTSPOT_NETWORK_NAME.' authentication server'); 32 33 echo "<div id='head'><h1>Wifidog authentication server for ". HOTSPOT_NETWORK_NAME ."</h1></div>\n"; 34 echo "<div id='navLeft'>\n"; 35 echo get_user_management_menu(); 36 echo "</div>\n"; 33 37 echo "<div id='content'>\n"; 34 38 trunk/wifidog-auth/wifidog/portal/index.php
r226 r299 67 67 if(RSS_SUPPORT) 68 68 { 69 $old_error_level = error_reporting(E_ERROR);69 // $old_error_level = error_reporting(E_ERROR); 70 70 define('MAGPIE_DIR', BASEPATH.MAGPIE_REL_PATH); 71 require_once(MAGPIE_DIR.'rss_fetch.inc'); 72 define('MAGPIE_DEBUG', 0); 73 71 // require_once(MAGPIE_DIR.'rss_fetch.inc'); 72 // define('MAGPIE_DEBUG', 0); 73 require_once BASEPATH.'classes/RssPressReview.inc'; 74 $press_review=new RssPressReview; 75 $network_rss_sources = NETWORK_RSS_URL; 76 $network_rss_html = null; 77 if(!empty($network_rss_sources)) 78 { 79 80 $network_rss_sources = array( 81 array('url' => $network_rss_sources, 'default_publication_interval' => 7*24*3600) 82 ); 83 $network_rss_html=$press_review->get_rss_html($network_rss_sources, 5); 84 } 85 86 $hotspot_rss_html=null; 87 if(!empty($hotspot_rss_url)) 88 { 89 $hotspot_rss_sources = array( 90 array('url' => $hotspot_rss_url, 'default_publication_interval' => 7*24*3600) 91 ); 92 $hotspot_rss_html=$press_review->get_rss_html($hotspot_rss_sources, 5); 93 } 74 94 /** 75 95 @return the generated html or the error message or an empty string if called without a URL. … … 106 126 107 127 108 $network_rss_html=generate_rss_html(NETWORK_RSS_URL);128 //$network_rss_html=generate_rss_html(NETWORK_RSS_URL); 109 129 //echo $networkrss_html; 110 130 $smarty->assign("network_rss_html", $network_rss_html); 111 131 112 132 113 $hotspot_rss_html=generate_rss_html($hotspot_rss_url);133 //$hotspot_rss_html=generate_rss_html($hotspot_rss_url); 114 134 //echo $hotspot_rss_html; 115 135 $smarty->assign("hotspot_rss_html", $hotspot_rss_html); 116 error_reporting($old_error_level);136 // error_reporting($old_error_level); 117 137 } 118 138 $smarty->assign("user_management_menu", get_user_management_menu());
