Changeset 2381

Show
Ignore:
Timestamp:
08/14/06 20:57:20 (6 months ago)
Author:
demian
Message:

comment correction

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/0.6-bugfix/etc/release.sh

    r2379 r2381  
    6969    # Check that the release directory doesn't already exist (fresh export): 
    7070    if [ -d "/tmp/$SVN_REPO_LEAF_FOLDER_NAME" ]; then 
    71       echo "Removing last $PROJECT_NAME export ..." 
     71      echo "Removing last $SVN_REPO_LEAF_FOLDER_NAME export ..." 
    7272      rm -rf /tmp/$SVN_REPO_LEAF_FOLDER_NAME 
    7373    fi 
     
    7575    # Check that the release directory doesn't already exist: 
    7676    if [ -d "/tmp/$PROJECT_NAME-$RELEASE_NAME" ]; then 
     77      echo "Removing last $PROJECT_NAME-$RELEASE_NAME renamed export ..." 
     78      rm -rf /tmp/$PROJECT_NAME-$RELEASE_NAME 
     79    fi 
     80 
     81    # Check that the release directory doesn't already exist: 
     82    if [ -d "/tmp/$PROJECT_NAME" ]; then 
    7783      echo "Removing last $PROJECT_NAME renamed export ..." 
    78       rm -rf /tmp/$PROJECT_NAME-$RELEASE_NAME 
     84      rm -rf /tmp/$PROJECT_NAME 
     85    fi 
     86 
     87    # Check that the minimal release directory doesn't already exist: 
     88    if [ -d "/tmp/$PROJECT_NAME-$RELEASE_NAME-minimal" ]; then 
     89      echo "Removing last $PROJECT_NAME-$RELEASE_NAME-minimal renamed export ..." 
     90      rm -rf /tmp/$PROJECT_NAME-$RELEASE_NAME-minimal 
    7991    fi 
    8092 
    8193    # Check that the last tarball doesn't exist: 
    8294    if [ -e "/tmp/$PROJECT_NAME-$RELEASE_NAME.tar.gz" ]; then 
    83       echo "Removing last $PROJECT_NAME tarball ..." 
     95      echo "Removing last $PROJECT_NAME-$RELEASE_NAME.tar.gz ..." 
    8496      rm -f /tmp/$PROJECT_NAME-$RELEASE_NAME.tar.gz 
     97    fi 
     98 
     99    # Check that the last tarball doesn't exist: 
     100    if [ -e "/tmp/$PROJECT_NAME-$RELEASE_NAME-minimal.tar.gz" ]; then 
     101      echo "Removing last $PROJECT_NAME-$RELEASE_NAME-minimal.tar.gz ..." 
     102      rm -f /tmp/$PROJECT_NAME-$RELEASE_NAME-minimal.tar.gz 
    85103    fi 
    86104 
    87105    # Check that the last apiDocs dir doesn't exist: 
    88106    if [ -d "/tmp/seagullApiDocs-$RELEASE_NAME" ]; then 
    89       echo "Removing last seagull apiDocs dir ..." 
     107      echo "Removing last seagullApiDocs-$RELEASE_NAME ..." 
    90108      rm -rf /tmp/seagullApiDocs-$RELEASE_NAME 
    91109    fi 
     
    93111    # Check that the last apiDocs tarball doesn't exist: 
    94112    if [ -e "/tmp/seagullApiDocs-$RELEASE_NAME.tar.gz" ]; then 
    95       echo "Removing last seagull apiDocs tarball ..." 
     113      echo "Removing last seagullApiDocs-$RELEASE_NAME.tar.gz ..." 
    96114      rm -f /tmp/seagullApiDocs-$RELEASE_NAME.tar.gz 
    97115    fi 
     
    131149function pruneDeveloper() 
    132150{ 
    133     #foo 
    134     echo test; 
     151    # remove GPL modules 
     152    rm -rf $PROJECT_NAME/modules/media 
     153    rm -rf $PROJECT_NAME/modules/event 
    135154} 
    136155 
     
    193212    rm -rf $PROJECT_NAME/modules/contactus 
    194213    rm -rf $PROJECT_NAME/modules/documentor 
    195     rm -rf $PROJECT_NAME/modules/ecomm 
    196     rm -rf $PROJECT_NAME/modules/event 
    197214    rm -rf $PROJECT_NAME/modules/export 
    198215    rm -rf $PROJECT_NAME/modules/faq 
    199216    rm -rf $PROJECT_NAME/modules/gallery2 
    200217    rm -rf $PROJECT_NAME/modules/guestbook 
    201     rm -rf $PROJECT_NAME/modules/media 
    202218    rm -rf $PROJECT_NAME/modules/messaging 
    203219    rm -rf $PROJECT_NAME/modules/newsletter 
     
    205221    rm -rf $PROJECT_NAME/modules/randommsg 
    206222    rm -rf $PROJECT_NAME/modules/user/tests 
    207  
    208223    rm -rf $PROJECT_NAME/tests 
    209224    rm -rf $PROJECT_NAME/www/js/html_ajax 
     
    402417checkArgs 
    403418 
    404 checkPreviousVersions 
     419#checkPreviousVersions 
    405420 
    406421#tagRelease 
     
    409424cd /tmp 
    410425 
    411 exportSvn 
     426#exportSvn 
    412427 
    413428createMinimalFlag 
     
    421436createTarball 
    422437 
    423 uploadToSfWholePackage 
    424  
    425 #generateApiDocs 
    426  
    427 #packageApiDocs 
    428  
    429 #uploadToSfApiDocs 
     438#uploadToSfWholePackage 
     439 
     440generateApiDocs 
     441 
     442packageApiDocs 
     443 
     444uploadToSfApiDocs 
    430445 
    431446#scpApiDocsToSglSite 
  • branches/0.6-bugfix/lib/SGL/Column.php

    r2084 r2381  
    77 
    88/** 
    9  * SGL_DataGridColumn 
     9 * SGL_DataGridColumn. 
     10 * 
    1011 * For creating columns to dataGrid and updating them by specified methods 
    11  * @package SGL_DataGridColumn 
     12 * 
     13 * @package SGL 
    1214 * @author Varico 
    13  * @copyright Copyright (c) 2005 
    1415 * @version $Id: DataGridColumn.php,v 1.4 2005/10/28 11:26:15 krzysztofk Exp $ 
    1516 * @access public 
     
    99100    { 
    100101        if (isset($params['name'])) { 
    101             $object->name = $params['name'];  
     102            $object->name = $params['name']; 
    102103        } else { 
    103104            $object->name = ''; 
    104105        } 
    105106        if (isset($params['img'])) { 
    106             $object->img = $params['img'];  
     107            $object->img = $params['img']; 
    107108        } else { 
    108109            $object->img = ''; 
    109110        } 
    110111        if (isset($params['url'])) { 
    111             $object->url = $params['url'];  
    112         } else {  
     112            $object->url = $params['url']; 
     113        } else { 
    113114            $object->url = ''; 
    114115        } 
    115116        if (isset($params['tips'])) { 
    116             $object->tips = $params['tips'];  
     117            $object->tips = $params['tips']; 
    117118        } else { 
    118119            $object->tips = ''; 
    119120        } 
    120121        if (isset($params['javaCode'])) { 
    121             $object->javaCode = $params['javaCode'];  
     122            $object->javaCode = $params['javaCode']; 
    122123        } else { 
    123124            $object->javaCode = ''; 
  • branches/0.6-bugfix/lib/SGL/DataGrid.php

    r2374 r2381  
    55//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    66 
     7 
    78// this library depends on PEAR's SQL_Parser and Spreadsheet_Excel_Writer 
    89 
     
    1314 
    1415/** 
    15  * SGL_DataGrid 
    16  * For browsing tables 
    17  * @package DataGrid 
     16 * SGL_DataGrid for browsing tables. 
     17 * 
     18 * @package SGL 
    1819 * @author Varico 
    19  * @copyright Copyright (c) 2004, Varico, Poznan, Poland 
    2020 * @version $Id: DataGrid.php,v 1.28.2.2 2006/03/20 08:42:33 danielk Exp $ 
    2121 * @access public 
  • branches/0.6-bugfix/lib/SGL/DataSource.php

    r2084 r2381  
    1212 * SGL_DataGridDataSource 
    1313 * For selecting and preparing manually added data 
    14  * @package SGL_DataGridDataSource 
     14 * @package SGL 
    1515 * @author Varico 
    16  * @copyright Copyright (c) 2004, Varico, Poznan, Poland 
    1716 * @version $Id 
    1817 * @access public 
     
    8786     * SGL_DataGridDataSource::setFilter() 
    8887     * Filter dataGrid data in _itemsData array 
    89      * @param array $filtersArray - given from dataGrid with filter values  
     88     * @param array $filtersArray - given from dataGrid with filter values 
    9089                    for each filterable column 
    9190     * @access public 
     
    111110                                    $numberOfFitFilters++; //filter match 
    112111                        } 
    113                     } elseif (($filter == "")||(strstr(strtoupper($data[$keyFilter]),  
     112                    } elseif (($filter == "")||(strstr(strtoupper($data[$keyFilter]), 
    114113                                                            strtoupper($filter)))) { 
    115114                            $numberOfFitFilters++; //filter match 
     
    117116                } 
    118117                //if all filters match in row 
    119                 if ($numberOfFitFilters == $numberOfFilters) {  
     118                if ($numberOfFitFilters == $numberOfFilters) { 
    120119                    $newItemData[] = $data; //add this row to new data array 
    121120                } 
     
    191190 
    192191                        //set summary of actual column 
    193                         $summarys[$column->dbName] =  
     192                        $summarys[$column->dbName] = 
    194193                            number_format($summaryOfPage, 2, '.', ''); 
    195194                    } 
     
    209208                        //set summary of actual column 
    210209                        if ($counter>0) { 
    211                             $summarys[$column->dbName] =  
     210                            $summarys[$column->dbName] = 
    212211                                number_format(($summaryOfPage/$counter), 2, '.', ''); 
    213212                        } else { 
    214                             $summarys[$column->dbName] =  
     213                            $summarys[$column->dbName] = 
    215214                                number_format($summaryOfPage, 2, '.', ''); 
    216215                        } 
  • branches/0.6-bugfix/lib/SGL/SQLDataSource.php

    r2319 r2381  
    88 
    99/** 
    10  * SGL_DataGridSQLDataSource 
     10 * SGL_DataGridSQLDataSource. 
     11 * 
    1112 * For selecting and preparing selected from database data 
    12  * @package SGL_DataGridSQLDataSource 
     13 * 
     14 * @package SGL 
    1315 * @author Varico 
    14  * @copyright Copyright (c) 2004, Varico, Poznan, Poland 
    1516 * @version $Id 
    1617 * @access public 
  • branches/0.6-bugfix/lib/SGL/WizardController.php

    r2293 r2381  
    22/* Reminder: always indent with 4 spaces (no tabs). */ 
    33// +---------------------------------------------------------------------------+ 
    4 // | Copyright (c) 2005, Demian Turner                                         | 
     4// | Copyright (c) 2006, Demian Turner                                         | 
    55// | All rights reserved.                                                      | 
    66// |                                                                           | 
     
    4848 
    4949/** 
    50  * Inherit from HTML_QuickForm_Controller to build  
     50 * Inherit from HTML_QuickForm_Controller to build 
    5151 * multi-page forms (wizards). 
    5252 * 
     
    5959   /** 
    6060    * Extracts the names of the current page and the current action from 
    61     * HTTP request data.  
     61    * HTTP request data. 
    6262    * 
    6363    * @access public 
     
    7171        $names = array_map('preg_quote', array_keys($this->_pages)); 
    7272        $regex = '/^_qf_(' . implode('|', $names) . ')_(.+?)(_x)?$/'; 
    73          
     73 
    7474    $count = 0; 
    7575    // This section of the code could most likely be improved ... 
     
    9292            if ( (preg_match("/next/", $p)) || (preg_match("/back/", $p)) ) 
    9393            { 
    94                 $matches = $arr;     
     94                $matches = $arr; 
    9595                break; 
    9696            } 
    9797            else if (preg_match("/display/", $p)) 
    9898            { 
    99                 $matches = $arr;     
     99                $matches = $arr; 
    100100            } 
    101101        } 
     
    115115/** 
    116116 * The action handles the HTTP redirect to a specific page. 
    117  *  
    118  * @package SGL_Wizard_Controller 
     117 * 
     118 * @package SGL 
    119119 * @version $Revision: 1.4 $ 
    120120 */ 
    121 class SGL_WizardControllerJump extends HTML_QuickForm_Action_Jump  
     121class SGL_WizardControllerJump extends HTML_QuickForm_Action_Jump 
    122122{ 
    123123   /** 
    124124    * Extracts the names of the current page and the current action from 
    125     * HTTP request data, strips off all query string vars.  
     125    * HTTP request data, strips off all query string vars. 
    126126    * 
    127127    * @access public 
     
    148148 
    149149    // simply remove all query string vars ... 
    150     // NOTE:  this may only work with Seagull SEF Url Handler, may need to  
     150    // NOTE:  this may only work with Seagull SEF Url Handler, may need to 
    151151    // be expanded to deal with other URL Handlers 
    152152    $action = preg_replace("/\?.*/", "", $action); 
    153      
     153 
    154154        $url    = $action . (false === strpos($action, '?')? '?': '&') . 
    155155                  $current->getButtonName('display') . '=true' . 
     
    162162/** 
    163163 * Class representing an action to perform on HTTP request. The Controller 
    164  * will select the appropriate Action to call on the request and call its  
     164 * will select the appropriate Action to call on the request and call its 
    165165 * perform() method. The subclasses of this class should implement all the 
    166166 * necessary business logic. 
    167  *  
    168  * @package SGL_Wizard_Controller 
     167 * 
     168 * @package SGL 
    169169 * @version $Revision: 1.1 $ 
    170170 */ 
     
    174174    * Processes the request, assigning controller output to var for 
    175175    * rendering. 
    176     *  
    177     * @access public 
    178     * @param  object HTML_QuickForm_Page    the current form-page  
     176    * 
     177    * @access public 
     178    * @param  object HTML_QuickForm_Page    the current form-page 
    179179    * @param  string    Current action name, as one Action object can serve multiple actions 
    180180    */ 
     
    190190/** 
    191191 * This action handles the output of the form. 
    192  *  
    193  *  
     192 * 
    194193 * @author  Alexey Borzov <avb@php.net> 
    195  * @package HTML_QuickForm_Controller 
     194 * @package SGL 
    196195 * @version $Revision: 1.5 $ 
    197196 */ 
     
    200199   /** 
    201200    * Actually outputs the form. 
    202     *  
     201    * 
    203202    * This assigns the wizard output to a variable for rendering 
    204     *  
     203    * 
    205204    * @access public 
    206205    * @param  object HTML_QuickForm_Page  the page being processed