← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to www/common/studpath.py

  • Committer: mattgiuca
  • Date: 2007-12-20 22:41:14 UTC
  • Revision ID: svn-v3-trunk0:2b9c9e99-6f39-0410-b283-7f802c844ae2:trunk:105
Removed all use of ivlepath variable. It is no longer set.
Instead, use ivle_install_dir which is taken from the admin-setup
configuration file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
www/common/studpath.py
44
44
 
45
45
    Returns (None, None) if the path is empty.
46
46
 
47
 
    See also: conf.jail_base
 
47
    See also: conf.student_dir
48
48
    """
49
49
    # Note: User can be a group name. There is absolutely no difference in our
50
50
    # current directory scheme.
56
56
    # accordance with our directory scheme.
57
57
    # (The first time is the name of the jail, the second is the user's home
58
58
    # directory within the jail).
59
 
    path = os.path.join(conf.jail_base, user, 'home', urlpath)
 
59
    path = os.path.join(conf.student_dir, user, 'home', urlpath)
60
60
 
61
61
    return (user, path)
62
62
 
79
79
    (user, subpath) = util.split_path(urlpath)
80
80
    if user is None: return (None, None, None)
81
81
 
82
 
    jail = os.path.join(conf.jail_base, user)
 
82
    jail = os.path.join(conf.student_dir, user)
83
83
    path = os.path.join('home', urlpath)
84
84
 
85
85
    return (user, jail, path)