Changeset 1033

Show
Ignore:
Timestamp:
05/10/06 16:51:44 (7 years ago)
Author:
fproulx
Message:

2006-05-10 François Proulx <francois.proulx@…>

  • Added sweetTitles tooltips script, now if you need to add tooltips simply add the 'title' attribute to you html <a>, <attr>, <accroym> tags
  • Fixed usort bug in MainUI
  • Fixed download (wget) in install.php
Location:
trunk/wifidog-auth
Files:
2 added
6 modified

Legend:

Unmodified
Added
Removed

  • trunk/wifidog-auth/CHANGELOG

    r1032 r1033  
     12006-05-10 François Proulx <francois.proulx@gmail.com> 
     2        * Added sweetTitles tooltips script, now if you need to add tooltips simply add the 'title' attribute to you html <a>, <attr>, <accroym> tags 
     3        * Fixed usort bug in MainUI 
     4        * Fixed download (wget) in install.php 
     5 
    162006-05-09 Benoit Grégoire  <bock@step.polymtl.ca> 
    27        * Working (if slightly basic) theme manager.  You can pick the theme in the network configuration. 
    … …  
    611        * Completely rip out the old local_content system, and a bunch of obsolete defines and config variables. 
    712        * Get rid of PHP generated stylesheets 
    8          
     13 
    9142006-05-09 Benoit Grégoire  <bock@step.polymtl.ca> 
    1015        * Finish content assignation system 
    … …  
    1318        * Change MainUI::apendContent to MainUI::addContent 
    1419 
    15 2006-04-28 François Proulx <francois.proulx@gmail.com>   
     202006-04-28 François Proulx <francois.proulx@gmail.com> 
    1621        * Fixed error in initial data script 
    17          
     22 
    18232006-04-28 Benoit Grégoire  <bock@step.polymtl.ca> 
    1924        * wifidog/login/index.php: Correctly use DEFAULT_NODE_ID from config.php instead of hardcoded 'default' 
    … …  
    21262006-04-28 François Proulx <francois.proulx@gmail.com> 
    2227        * Fixed initial_data schema script so that it adds a dummy server. 
    23          
     28 
    24292006-04-25 François Proulx <francois.proulx@gmail.com> 
    2530        * Updated JavaScript code to work with Google Maps v2 API 
    2631        * v2 will now provide full maps of European countries and is a bit faster 
    2732        * Updated the schema accordingly with new GMaps values 
    28          
     33 
    29342006-04-24 Benoit Grégoire  <bock@step.polymtl.ca> 
    3035        * Dependencies.php:  Small fix in case gettext isn't installed 
    … …  
    3439 
    35402006-04-24 Benoit Grégoire  <bock@step.polymtl.ca> 
    36         * Major system locale handling overhaull.  Hopefully abstract out the UTF8 problems once and for all,  
    37         allowing everyone to define them the same way.  Fix a few bugs along the way.   
     41        * Major system locale handling overhaull.  Hopefully abstract out the UTF8 problems once and for all, 
     42        allowing everyone to define them the same way.  Fix a few bugs along the way. 
    3843        Should also be a little faster. 
    3944 
    40452006-04-24 Benoit Grégoire  <bock@step.polymtl.ca> 
    4146        * Revert Rob's SYSTEM_PATH change.  Sorry about that.  The devs spent hours to finally get the PATH 
    42          stuff consistent and fixing the countless bugs that this process introduced.  
     47         stuff consistent and fixing the countless bugs that this process introduced. 
    4348         Maybe some links still need to use BASE_URL_PATH instead of BASE_SSL_PATH, 
    44         (or vice-versa) but it was on purpose that SYSTEM_PATH was not made available to Smarty.   
     49        (or vice-versa) but it was on purpose that SYSTEM_PATH was not made available to Smarty. 
    4550        We already have 3 defines to be used for links and html refs, that's enough 
    4651         BASE_SSL_PATH should be used to enter SSL mode (if available) 
    … …  
    4853         explicitely do not want someting to be referenced over http 
    4954         BASE_URL_PATH should be used in all other cases to avoid needless SSL warning 
    50          
     55 
    51562006-04-17 Rob Janes <janes.rob@gmail.com> 
    5257        * javascript for validating and navigating forms. 
    … …  
    65702006-04-01 François Proulx <francois.proulx@gmail.com> 
    6671        * Dumped initial schema from working install 
    67          
     72 
    68732006-03-31 Benoit Grégoire  <bock@step.polymtl.ca> 
    6974        * dump_initial_data_postgres.sh:  Add the content_available_display_pages table to the dump, can someone re-generate the initial data from a working install 
    … …  
    76812006-03-28 François Proulx <francois.proulx@gmail.com> 
    7782        * Fixed error in initial schema (bad client encoding) 
    78          
     83 
    79842006-03-28 François Proulx <francois.proulx@gmail.com> 
    8085        * Fixed schema 37 : left_area_top 
    8186        * Updated initial schema 
    82          
     87 
    83882006-03-27 Benoit Grégoire  <bock@step.polymtl.ca> 
    8489        * First step in massive simplification of CSS and templates 
    … …  
    102107          the code path to the map does not use SSL, but the outgoing URLs do. 
    103108        * Removed lost echo in Locale.php 
    104          
     109 
    1051102006-03-21 Benoit Grégoire  <bock@step.polymtl.ca> 
    106         * login/index.php: Remove huge security hole introduced by stylistic changes in the file.   
    107         A user could login to any hotspot by simply filling a blank form because of a gratuitous  
     111        * login/index.php: Remove huge security hole introduced by stylistic changes in the file. 
     112        A user could login to any hotspot by simply filling a blank form because of a gratuitous 
    108113        change from empty to is_null everywhere.  Remove escaping or REQUEST parameters in non SQL 
    109114         related code, as this would lead to double unescaping down the line.  Remove logic dependent 
    … …  
    1121172006-03-19 François Proulx <francois.proulx@gmail.com> 
    113118        * Updated French translations 
    114          
     119 
    1151202006-03-18 Rob Janes <janes.rob@gmail.com> 
    116121        * path_defines_base working for combinations of DocumentRoot, Alias, 
    … …  
    127132        * Removed stale owner_sendfiles.php (now integrated in the Content Manager) 
    128133        * Cleaned up a bunch of stale TODOs 
    129          
     134 
    1301352006-03-16 Max Horváth <max.horvath@maxspot.de> 
    131136        * updated language files (new german strings have already been translated) 

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

    r1031 r1033  
    162162     * placed.  Must be one of the display aread defined in the 
    163163     * content_available_display_areas table 
    164      *  
     164     * 
    165165     * @param string $content HTML content to be added to the area 
    166      *  
     166     * 
    167167     * @param integer $display_order_index The order in which the content should 
    168168     * be displayed 
    … …  
    193193    private function generateDisplayContent() { 
    194194        //pretty_print_r($this->_contentArray); 
    195         usort($this->_contentArray, array ('MainUI', '_contentArrayCmp')); 
     195        usort($this->_contentArray, array($this, "_contentArrayCmp")); 
    196196        foreach ($this->_contentArray as $content_fragment) { 
    197197            $this->_contentDisplayArray[$content_fragment['display_area']] .= $content_fragment['content']; 

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

    r1031 r1033  
    210210 * Normally MAGPIE_REL_PATH is "lib/magpie/". 
    211211 */ 
    212 define('RSS_SUPPORT', true); 
     212define('RSS_SUPPORT', false); 
    213213 
    214214/** 
    … …  
    221221 * "Phlickr". 
    222222 */ 
    223 define('PHLICKR_SUPPORT', true); 
     223define('PHLICKR_SUPPORT', false); 
    224224 
    225225/** 

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

    r916 r1033  
    324324} 
    325325 
     326function downloadFile($remoteURL, $localPath) { 
     327        set_time_limit(1500); // 25 minutes timeout 
     328        if(copy($remoteURL, $localPath)) 
     329                return true; 
     330        else 
     331                return false; 
     332} 
     333 
    326334################################### 
    327335# 
    … …  
    579587 
    580588            print "Download source code ($filename) : "; 
    581             if (!file_exists($filename)) 
    582                 exec("wget \"$smarty_full_url\" 2>&1", $output, $return); 
    583             if (!file_exists($filename)) { 
     589            if (!file_exists("/tmp/".$filename)) 
     590                //exec("wget \"$smarty_full_url\" 2>&1", $output, $return); 
     591                downloadFile($smarty_full_url, "/tmp/".$filename); 
     592 
     593            if (!file_exists("/tmp/".$filename)) { 
    584594                print "<B STYLE=\"color:red\">Error</B><P>Current working directory : <B>$basepath/tmp/smarty</B>"; 
    585595                $output = implode("\n", $output); 
    … …  
    592602 
    593603            print "Uncompressing : "; 
    594             $dir_array = split(".tar.gz", $filename); 
     604            $dir_array = split(".tar.gz", "/tmp/".$filename); 
    595605            $dirname = array_shift($dir_array); 
    596606 
    … …  
    623633 
    624634            print "Download source code ($filename) : "; 
    625             if (!file_exists($filename)) 
    626                 exec("wget \"$magpierss_full_url\" 2>&1", $output, $return); 
    627             if (!file_exists($filename)) { 
     635            if (!file_exists("/tmp/".$filename)) 
     636                //exec("wget \"$magpierss_full_url\" 2>&1", $output, $return); 
     637                downloadFile($smarty_full_url, "/tmp/".$filename); 
     638 
     639            if (!file_exists("/tmp/".$filename)) { 
    628640                print "<B STYLE=\"color:red\">Error</B><P>Current working directory : <B>$basepath/tmp/smarty</B>"; 
    629641                $output = implode("\n", $output); 
    … …  
    636648 
    637649            print "Uncompressing : "; 
    638             $dir_array = split(".tar.gz", $filename); 
     650            $dir_array = split(".tar.gz", "/tmp/".$filename); 
    639651            $dirname = array_shift($dir_array); 
    640652            if (!file_exists($dirname)) 
    … …  
    672684 
    673685            print "Download source code ($filename) : "; 
    674             if (!file_exists($filename)) 
    675                 exec("wget \"$phlickr_full_url\" 2>&1", $output, $return); 
    676             if (!file_exists($filename)) { # Error occured, print output of wget 
     686            if (!file_exists("/tmp/".$filename)) 
     687                //exec("wget \"$phlickr_full_url\" 2>&1", $output, $return); 
     688                downloadFile($smarty_full_url, "/tmp/".$filename); 
     689 
     690            if (!file_exists("/tmp/".$filename)) { # Error occured, print output of wget 
    677691                print "<B STYLE=\"color:red\">Error</B><P>Current working directory : <B>$basepath/tmp/smarty</B>"; 
    678692                $output = implode("\n", $output); 
    … …  
    685699 
    686700            print "Uncompressing : "; 
    687             $dirname_array = split(".tgz", $filename); 
     701            $dirname_array = split(".tgz", "/tmp/".$filename); 
    688702            $dirname = array_shift($dirname_array); 
    689703            if (!file_exists($dirname)) 

  • trunk/wifidog-auth/wifidog/media/base_theme/stylesheet.css

    r1031 r1033  
    1 /* Important note:  You may not assume ANYTHING about the path to images or media  
     1/* Important note:  You may not assume ANYTHING about the path to images or media 
    22that isn't under this file's theme pack.  In other words, no ../ relative links. */ 
    33/********** General HTML section **********/ 
    … …  
    250250 
    251251/** Messages */ 
     252 
     253/* Fading Tooltips By Dustin Diaz*/ 
     254body div#toolTip { 
     255        position:absolute; 
     256        z-index:1000; 
     257        width:320px; 
     258        background:#000; 
     259/*      border:2px double #fff;*/ 
     260        text-align:left; 
     261        padding:5px; 
     262        min-height:1em; 
     263        -webkit-border-radius:5px; 
     264        -moz-border-radius:5px; 
     265} 
     266body div#toolTip p { margin:0;padding:0;color:#fff;font:11px/12px verdana,arial,sans-serif; } 
     267body div#toolTip p em { display:block;margin-top:3px;color:#f60;font-style:normal;font-weight:bold; } 
     268body div#toolTip p em span { font-weight:bold;color:#fff; } 
     269 
    252270.errormsg { 
    253271    font-weight: bold; 

  • trunk/wifidog-auth/wifidog/templates/classes/MainUI_Display.tpl

    r1031 r1033  
    4646 
    4747*} 
    48  
    4948<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> 
    50  
    5149<html> 
    52  
    5350    <head> 
    5451        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
    … …  
    5653        <meta http-equiv="Expires" content="-1"> 
    5754        {$htmlHeaders} 
    58  
    5955        <title>{$title}</title> 
    60  
    6156        {foreach from=$stylesheetUrlArray item=stylesheetUrl} 
    6257          <link rel="stylesheet" type="text/css" href="{$stylesheetUrl}"> 
    63         {/foreach}               
     58        {/foreach} 
    6459                <script src="{$base_url_path}js/formutils.js"></script> 
    65  
     60                <script src="{$base_url_path}js/addEvent.js"></script> 
     61                <script src="{$base_url_path}js/sweetTitles.js"></script> 
    6662    </head> 
    67  
    6863    <body id='page' class='{$page_name}'> 
    6964        {if !empty($contentDisplayArray.page_header) || $debugRequested} 
    … …  
    7671                {/if} 
    7772                </div> 
    78         {/if}  
    79  
    80  
     73        {/if} 
    8174        <div id="page_body"> 
    8275        {if !empty($contentDisplayArray.left_area_top) ||  !empty($contentDisplayArray.left_area_middle) ||  !empty($contentDisplayArray.left_area_middle)} 
    … …  
    9689                            {$contentDisplayArray.left_area_bottom} 
    9790                        </div> 
    98                         {/if}    
     91                        {/if} 
    9992                </div> 
    10093        {/if} 
    101          
    10294        {if !empty($contentDisplayArray.main_area_top) ||  !empty($contentDisplayArray.main_area_middle) ||  !empty($contentDisplayArray.main_area_middle)} 
    10395                <div id="main_area"> 
    … …  
    116108                            {$contentDisplayArray.main_area_bottom} 
    117109                        </div> 
    118                         {/if}    
     110                        {/if} 
    119111                </div> 
    120         {/if}         
    121  
     112        {/if} 
    122113          {if !empty($contentDisplayArray.right_area_top) ||  !empty($contentDisplayArray.right_area_middle) ||  !empty($contentDisplayArray.right_area_bottom)} 
    123114                <div id="right_area"> 
    … …  
    136127                            {$contentDisplayArray.right_area_bottom} 
    137128                        </div> 
    138                         {/if}    
     129                        {/if} 
    139130                </div> 
    140         {/if}    
     131        {/if} 
    141132        </div> 
    142133    {if !empty($contentDisplayArray.page_footer)} 
    … …  
    144135                        {$contentDisplayArray.page_footer} 
    145136        </div> 
    146     {/if}  
     137    {/if} 
    147138 
    148139        {foreach from=$footerScripts item=currScript}