Changeset 30


Ignore:
Timestamp:
Dec 10, 2005 2:36:04 AM (18 years ago)
Author:
scdev
Message:

reverted some changes to make more compatible with old sites, using adm_ template nmes

Location:
tags/1.0.0
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • tags/1.0.0/bin/module_maker/list_template.cli.php

    r29 r30  
    120120</div>
    121121
    122 <?php include 'list_info.ihtml'; \x3f>
     122<?php include 'adm_list_info.ihtml'; \x3f>
    123123
    124124<table class="list">

  • tags/1.0.0/bin/module_maker/skel/adm_list.ihtml

    r29 r30  
    1515</div>
    1616
    17 <?php include 'list_info.ihtml'; ?>
     17<?php include 'adm_list_info.ihtml'; ?>
    1818
    1919<table class="list">

  • tags/1.0.0/bin/module_maker/skel/admin.php

    r29 r30  
    170170 *****************************************************************************/
    171171
    172 include 'header.ihtml';
     172include 'adm_header.ihtml';
    173173include $main_template;
    174 include 'footer.ihtml';
     174include 'adm_footer.ihtml';
    175175
    176176/******************************************************************************

  • tags/1.0.0/bin/module_maker/skel/public.php

    r29 r30  
    119119
    120120// We have the data, and no errors, so here come the templates.
    121 include 'header.ihtml';
     121include 'adm_header.ihtml';
    122122include $main_template;
    123 include 'footer.ihtml';
     123include 'adm_footer.ihtml';
    124124
    125125?>

  • tags/1.0.0/config/security_roster.inc.php

    r29 r30  
    251251define('ZONE_ADMIN_PRODUCTS_FUNC_LIST', 'root,admin,editor');
    252252define('ZONE_ADMIN_PRODUCTS_FUNC_REORDER', 'root,admin,editor');
     253define('ZONE_ADMIN_FILES', 'root,admin,editor');
     254define('ZONE_ADMIN_FILES_FUNC_ADD', 'root,admin,editor');
     255define('ZONE_ADMIN_FILES_FUNC_EDIT', 'root,admin,editor');
     256define('ZONE_ADMIN_FILES_FUNC_DELETE', 'root,admin,editor');
     257define('ZONE_ADMIN_FILES_FUNC_LIST', 'root,admin,editor');
     258define('ZONE_ADMIN_FILES_FUNC_REORDER', 'root,admin,editor');

  • tags/1.0.0/lib/App.inc.php

    r29 r30  
    352352    }
    353353
    354     $url = ohref($url, $carry_args, $always_include_sid);
     354    $url = url($url, $carry_args, $always_include_sid);
    355355   
    356356    header(sprintf('Location: %s', $url));
    … …  
    459459 * @return string url with attached queries and, if not using cookies, the session id
    460460 */
    461 function oHREF($url='', $carry_args=null, $always_include_sid=false)
     461function url($url='', $carry_args=null, $always_include_sid=false)
    462462{
    463463    static $_using_trans_sid;
    … …  
    509509    // Get the first delimiter that is needed in the url.
    510510    $delim = preg_match('/\?/', $url) ? ini_get('arg_separator.output') : '?';
    511    
     511
    512512    $q = '';
    513513    if ($do_carry_queries) {
    … …  
    553553        $url .= $q . $delim . session_name() . '=' . session_id();
    554554//         logMsg(sprintf('oHREF appending session id to URL: %s', $url), LOG_DEBUG, __FILE__, __LINE__);
    555         return $url;
    556555    } else {
    557556        $url .= $q;
    558         return $url;
    559     }
     557    }
     558
     559    return $url;
     560}
     561
     562/**
     563 * Returns a URL processed with App::url and htmlentities for printing in html.
     564 *
     565 * @access  public
     566 * @param   string  $url    Input URL to parse.
     567 * @return  string          URL with App::url() and htmlentities() applied.
     568 * @author  Quinn Comendant <quinn@strangecode.com>
     569 * @since   09 Dec 2005 17:58:45
     570 */
     571function oHREF($url, $carry_args=null, $always_include_sid=false)
     572{
     573    $url = url($url, $carry_args, $always_include_sid);
     574    // Replace any & not followed by an html or unicode entity with it's &amp; equivalent.
     575    $url = preg_replace('/&(?![\w\d#]{1,10};)/', '&amp;', $url);
     576    return $url;
    560577}
    561578

  • tags/1.0.0/lib/Utilities.inc.php

    r29 r30  
    206206
    207207/**
     208 * Encodes an email into a user (at) domain (dot) com format.
     209 *
     210 * @access  public
     211 * @param   string   $email   An email to encode.
     212 * @param   string   $at      Replaces the @.
     213 * @param   string   $dot     Replaces the ..
     214 * @return  string   Encoded email.
     215 */
     216function encodeEmail($email, $at='-at-', $dot='-dot-')
     217{
     218    $search = array('/@/', '/\./');
     219    $replace = array($at, $dot);
     220    return preg_replace($search, $replace, $email);
     221}
     222
     223/**
    208224 * Return a human readable filesize.
    209225 *

  • tags/1.0.0/templates/adm_admin_list.ihtml

    r29 r30  
    1717</div>
    1818
    19 <?php include 'list_info.ihtml'; ?>
     19<?php include 'adm_list_info.ihtml'; ?>
    2020
    2121<table class="list" border="0" cellpadding="2" cellspacing="0">

  • tags/1.0.0/templates/adm_log_list.ihtml

    r29 r30  
    3737</div>
    3838
    39 <?php include 'list_info.ihtml'; ?>
     39<?php include 'adm_list_info.ihtml'; ?>
    4040
    4141<pre style="font: 9px monaco;">
Note: See TracChangeset for help on using the changeset viewer.