Changeset 1414

Show
Ignore:
Timestamp:
12/07/07 16:09:42 (8 months ago)
Author:
misja
Message:

Misja Hoebe <misja@curverider.co.uk> Merged in r1411, r1412, r1413

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • releases/0.9/includes.php

    r1387 r1414  
    124124 
    125125    /*************************************************************************** 
    126     *    CONTENT MODULES 
    127     *    This should make languages easier, although some kind of 
    128     *    selection process will be required 
    129     ****************************************************************************/ 
    130  
    131     // General 
    132         include_once($CFG->dirroot . "content/general/main.php"); 
    133     // Main index 
    134         include_once($CFG->dirroot . "content/mainindex/main.php"); 
    135     // User-related 
    136         include_once($CFG->dirroot . "content/users/main.php"); 
    137  
    138     /*************************************************************************** 
    139126    *    START-OF-PAGE RUNNING 
    140127    ****************************************************************************/ 

  • releases/0.9/mod/pages/legacy/content_about.html

    r1411 r1414  
    22 
    33<p>{{sitename}} is based on <a href="http://elgg.org">ELGG</a>, a 
    4 project started by <a href="http://elgg.org/ben">Ben Werdmuller</a> 
    5 and <ahref="http://elgg.org/dtosh">David Tosh</a>. The concept behind the 
    6 system is to develop a fully customizable social network. To achieve this 
    7 {{sitename}} is a hybrid of weblogging, e-portfolios and social networking.</p> 
     4flexible, and fully customizable social networking platform.</p> 
    85 
    9 <p>Users of {{sitename}} will have a digital repository of artefacts which can  
    10 be private or shared within communities. They will have a weblog which will be 
    11 able to link to artefacts in the repository creating a useful bed for 
    12 reflection. The social networking protocol will allow users to join up and 
    13 create a variety of learning communities. All elements and artefacts can have 
    14 access privileges attached determining who can view them.</p> 
     6<p>Users of {{sitename}} will have a digital repository of artefacts 
     7which can be private or shared within communities. They will have a 
     8weblog which will be able to link to artefacts in the repository 
     9creating a useful bed for reflection. The social networking protocol 
     10will allow users to join up and create a variety of communities. All 
     11elements and artefacts can have access privileges attached determining 
     12who can view them.</p> 
    1513 
    16 <p>It is hoped {{sitename}} will be a fun, useful tool which will place the 
    17 people at the center of their digital world.</p> 
     14<p>It is hoped {{sitename}} will be a fun, useful tool which will 
     15place the people at the center of their digital world.</p> 
    1816 
    19 <p>We would really appreciate all feedback and comments so we can continue to 
    20 develop and improve the system. We would also appreciate details on your usage 
    21 habits and features you would like to see added. </p> 
    22  
    23 <p>Join <a href="http://www.elgg.org">ELGG</a> community of users and 
    24 developers, there you will found resources and support.</p> 
     17<p>Join the <a href="http://elgg.org">ELGG</a> community of users 
     18and developers, where you will find more resources and support. We 
     19appreciate all feedback and comments so we can continue to develop and 
     20improve the system</p> 

  • releases/0.9/mod/pages/legacy/content_faq.html

    r1411 r1414  
    1 <p>This page contains any frequently asked questions. Before contacting us to ask a question please check to see if it has already been answered here. If it is not included here do not hesitate to get in touch.</p> 
     1<p>This page contains any frequently asked questions. Before 
     2contacting us to ask a question please check to see if it has already 
     3been answered here. If it is not included here do not hesitate to get in 
     4touch.</p> 
    25<p>[<i>available soon</i>]</p> 
    36<h3>About {{sitename}}</h3> 
    …… 
    4447<ul> 
    4548    <li>What are my access privileges?</li> 
    46     <li>How do I change access privileges on an element in my e-portfolio?</li> 
     49    <li>How do I change access privileges on an element in my 
     50    e-portfolio?</li> 
    4751</ul> 
    4852<h3>Security</h3> 

  • releases/0.9/mod/pages/legacy/content_privacy.html

    r1411 r1414  
    11<p><b>What This Privacy Policy Covers</b></p> 
    22<ul> 
    3 <li>This privacy policy relates to use of the {{{sitename}}} web site at 
    4 {{url}}</li> 
    5 <li>This privacy policy covers how {{sitename}} (hereafter named 'we') will 
    6 treat personal information that we collect. Personal information is <b>your</b> 
    7 information and includes identifiers like your name, address, email address, 
    8 phone number.</li> 
    9 <li>We will not send you any junk emails. Furthermore we will not send you any 
    10 information unless you have specifically requested we do so. An exception to  
    11 this rule will be the initial email validation when you create a new account. 
    12 </li> 
    13 <li>Children under 13 are not permitted to use the {{sitename}} service, and so 
    14 this privacy policy makes no provision for children's use of the site.</li> 
     3    <li>This privacy policy relates to use of the {{{sitename}}} 
     4    web site at {{url}}</li> 
     5    <li>This privacy policy covers how {{sitename}} (hereafter 
     6    named 'we') will treat personal information that we collect. 
     7    Personal information is <b>your</b> information and includes 
     8    identifiers like your name, address, email address, phone number.</li> 
     9    <li>We will not send you any junk emails. Furthermore we will 
     10    not send you any information unless you have specifically requested 
     11    we do so. An exception to this rule will be the initial email 
     12    validation when you create a new account.</li> 
     13    <li>Children under 13 are not permitted to use the {{sitename}} 
     14    service, and so this privacy policy makes no provision for 
     15    children's use of the site.</li> 
    1516</ul> 
    1617 
    1718<p><b>Changes to this Privacy Policy</b></p> 
    1819 
    19 <p>{{sitename}} may update this policy at any time for any reason. If there are 
    20 any significant changes to how we handle personal information we will send a 
    21 notice to the primary email address specified in your {{sitename}} account or 
    22 by placing a prominent notice on our site.</p> 
     20<p>{{sitename}} may update this policy at any time for any reason. 
     21If there are any significant changes to how we handle personal 
     22information we will send a notice to the primary email address specified 
     23in your {{sitename}} account or by placing a prominent notice on our 
     24site.</p> 
    2325 
    2426<p>If you have questions or suggestions you can contact us at:</p> 

  • releases/0.9/mod/pages/legacy/content_terms.html

    r1411 r1414  
    1 <p><b>If you use the {{sitename}} web site you agree to be bound by the following terms and conditions ('Terms of Use').</b></p> 
     1<p><b>If you use the {{sitename}} web site you agree to be bound 
     2by the following terms and conditions ('Terms of Use').</b></p> 
    23 
    34<p><b>Basic Terms</b></p> 
    45 
    5 <p> 1. You must be 13 years and older to use this site.<br /> 
    6    2. You are responsible for any activity that occurs under your screen name.<br /> 
    7    3. You are responsible for keeping your password secure.<br /> 
    8    4. You must not abuse, harass, threaten, impersonate or intimidate other {{sitename}} users.<br /> 
    9    5. You may not use the {{sitename}} service for any illegal or unauthorized purpose. International users agree to comply with all local laws regarding online conduct and acceptable content.<br /> 
    10    6. You are solely responsible for your conduct and any data, text, information, screen names, graphics, photos, profiles, audio and video clips, links ('Content')that you submit, post, and display on the {{sitename}} service.<br /> 
    11    7. {{sitename}} is intended for personal use, not a business solution. Professional or corporate uses of {{sitename}} are at your own risk.<br /> 
    12    8. You must not modify, adapt or hack {{sitename}} or modify another website so as to falsely imply that it is associated with {{sitename}}.<br /> 
    13    9. You must not create or submit unwanted email to any {{sitename}} members ('Spam').<br /> 
    14   10. You must not transmit any worms or viruses or any code of a destructive nature.<br /> 
    15   11. You must not, in the use of {{sitename}}, violate any laws in your jurisdiction (including but not limited to copyright laws).<br /> 
    16   12. Any loss of, or damage to, data is not the responsibility of {{sitename}}. Use of this service is at your own risk.</p> 
     6<ol> 
     7    <li>You must be 13 years and older to use this site.</li> 
     8    <li>You are responsible for any activity that occurs under your 
     9    screen name.</li> 
     10    <li>You are responsible for keeping your password secure.</li> 
     11    <li>You must not abuse, harass, threaten, impersonate or 
     12    intimidate other {{sitename}} users.</li> 
     13    <li>You may not use the {{sitename}} service for any illegal or 
     14    unauthorized purpose. International users agree to comply with all 
     15    local laws regarding online conduct and acceptable content.</li> 
     16    <li>You are solely responsible for your conduct and any data, 
     17    text, information, screen names, graphics, photos, profiles, audio 
     18    and video clips, links ('Content')that you submit, post, and display 
     19    on the {{sitename}} service.</li> 
     20    <li>{{sitename}} is intended for personal use, not a business 
     21    solution. Professional or corporate uses of {{sitename}} are at your 
     22    own risk.</li> 
     23    <li>You must not modify, adapt or hack {{sitename}} or modify 
     24    another website so as to falsely imply that it is associated with 
     25    {{sitename}}.</li> 
     26    <li>You must not create or submit unwanted email to any 
     27    {{sitename}} members ('Spam').</li> 
     28    <li>You must not transmit any worms or viruses or any code of a 
     29    destructive nature.</li> 
     30    <li>You must not, in the use of {{sitename}}, violate any laws 
     31    in your jurisdiction (including but not limited to copyright laws).</li> 
     32    <li>Any loss of, or damage to, data is not the responsibility 
     33    of {{sitename}}. Use of this service is at your own risk.</li> 
     34</ol> 
    1735 
    18 <p>Violation of any of these agreements will result in the termination of your {{sitename}} account. While {{sitename}} prohibits such conduct and content on its site, you understand and agree that {{sitename}} cannot be responsible for the Content posted on its web site and, despite our best efforts, may be exposed to such materials and that you use the {{sitename}} service at your own risk.<p> 
    19  
     36<p>Violation of any of these agreements will result in the 
     37termination of your {{sitename}} account. While {{sitename}} prohibits 
     38such conduct and content on its site, you understand and agree that 
     39{{sitename}} cannot be responsible for the Content posted on its web 
     40site and, despite our best efforts, may be exposed to such materials and 
     41that you use the {{sitename}} service at your own risk. 
     42<p> 
    2043<p><b>General Conditions</b></p> 
    2144<ul> 
    22 <li>We reserve the right to modify or terminate the {{sitename}} service for any reason, without notice at any time.</li> 
    23 <li> We reserve the right to alter these Terms of Use at any time. If the alterations constitute a material change to the Terms of Use, we will notify you via an appropriate method. What is a 'material change' is at our discretion</li> 
    24 <li>We reserve the right to refuse service to anyone for any reason at any time.</li> 
    25  </ul> 
     45    <li>We reserve the right to modify or terminate the 
     46    {{sitename}} service for any reason, without notice at any time.</li> 
     47    <li>We reserve the right to alter these Terms of Use at any 
     48    time. If the alterations constitute a material change to the Terms 
     49    of Use, we will notify you via an appropriate method. What is a 
     50    'material change' is at our discretion</li> 
     51    <li>We reserve the right to refuse service to anyone for any 
     52    reason at any time.</li> 
     53</ul> 
    2654 
    2755<p><b>Copyright</b></p> 
    2856 
    29 <p><b>We claim no intellectual property rights over any material you provide to the {{sitename}} service</b></p> 
     57<p><b>We claim no intellectual property rights over any material 
     58you provide to the {{sitename}} service</b></p> 

  • releases/0.9/mod/pages/lib.php

    r1383 r1414  
    2020    pages_dbsetup(); 
    2121 
    22     // legacy pages 
     22    //DEPRECATED: legacy pages 
     23    /* 
    2324    $PAGE->pages->old_compat = array( 
    2425        'about.php' => array( 
    …… 
    5556        'function' => 'pages:frontpage_loggedout', 
    5657        ); 
    57  
     58     */ 
    5859} 
    5960 
    …… 
    6566    $CFG->templates->variables_substitute['pagesmenu'][] = 'pages_tplkw_menu'; 
    6667    $CFG->templates->variables_substitute['page'][] = 'pages_tplkw_page'; 
     68    $CFG->templates->variables_substitute['sysadminemail'][] = 'pages_tplkw_sysadminemail'; 
    6769 
    6870    if (defined('context') && context == 'pages') { 
    …… 
    134136            // insert first page 
    135137            $page = new StdClass; 
    136             $page->name = __gettext('Main'); 
    137             $page->uri = pages_build_uri($page->name); 
    138             $page->title = __gettext('Main page'); 
    139             $page->content = pages_html_wrap('p', __gettext('This is your first page. Edit me!')); 
    140             $page->content .= pages_html_wrap('p', __gettext('Installed on ') . pages_html_wrap('a', '{{url}}', array('href' => '{{url}}'))); 
    141             if (pages_php_allowed()) { 
    142                 $page->content .= pages_html_wrap('p', __gettext('Current time: ') . ' <?php echo strftime("%Y-%m-%d, %H:%m") ?>'); 
    143             } 
    144             $page->content .= pages_html_wrap('h2', __gettext('Blog summary')); 
    145             $page->content .= pages_html_wrap('div', '{{blogsummary:5}}'); 
    146  
    147             $rs = insert_record('pages', $page); 
    148             $page->ident = $rs; 
    149  
    150             set_config('pages_default', $page->ident); 
    151  
    152             if ($rs) { 
    153                 // first child 
    154                 $page2 = new StdClass; 
    155                 $page2->name = 'Example page'; 
    156                 $page2->uri = pages_build_uri('Example page'); 
    157                 $page2->title = __gettext('Example page for ') . $CFG->sitename; 
    158                 $page2->content = pages_html_wrap('p', __gettext('Example content')); 
    159                 $page2->content .= pages_html_wrap('p', __gettext('Random users: {{randomusers}}')); 
    160                 $page2->content .= pages_html_wrap('p', __gettext('Top tags: {{toptags}}')); 
    161                 $page2->parent = $page->ident; 
    162  
    163                 $rs = insert_record('pages', $page2); 
    164                 $page2->ident = $rs; 
    165             } 
     138            $page->name = __gettext('About'); 
     139            $page->title = __gettext('About') . " {{sitename}}"; 
     140            $page->content = @file_get_contents(dirname(__FILE__).'/legacy/content_about.html'); 
     141 
     142            $page = pages_create_page($page); 
     143 
     144            if ($page) { 
     145                set_config('pages_default', $page->ident); 
     146 
     147                $_page = new StdClass; 
     148                $_page->uri = 'privacy.php'; //backward compatibility 
     149                $_page->title = __gettext('Privacy Policy'); 
     150                $_page->content = @file_get_contents(dirname(__FILE__).'/legacy/content_privacy.html'); 
     151                $_page->parent = $page->ident; 
     152                $_page = pages_create_page($_page); 
     153 
     154                $_page = new StdClass; 
     155                $_page->uri = 'terms.php'; //backward compatibility 
     156                $_page->title = __gettext('Terms and Conditions'); 
     157                $_page->content = @file_get_contents(dirname(__FILE__).'/legacy/content_terms.html'); 
     158                $_page->parent = $page->ident; 
     159                $_page = pages_create_page($_page); 
     160            } 
     161 
     162            $page = new StdClass; 
     163            $page->name = __gettext('FAQ'); 
     164            $page->title = __gettext('Frequently Asked Questions'); 
     165            $page->content = @file_get_contents(dirname(__FILE__).'/legacy/content_faq.html'); 
     166 
     167            $page = pages_create_page($page); 
    166168 
    167169        } else { 
    …… 
    287289} 
    288290 
     291function pages_tplkw_sysadminemail() { 
     292    global $CFG; 
     293    return $CFG->sysadminemail; 
     294} 
     295 
    289296function pages_frontpage($logged=false) { 
    290297    require_once(dirname(__FILE__) . '/lib/pages.inc.php'); 
    …… 
    469476 
    470477    return pages_html_wrap('input', null, $attrs); 
     478} 
     479 
     480function pages_html_form($name, $body, $method='post', $action='', $attrs=null) { 
     481    $body .= pages_html_input('hidden', array('name'=>'form_key', 'value'=>elggform_get_key())); 
     482    $attrs = array_merge(array('id'=>$name, 'name'=>$name, 'method'=>$method, 'action'=>$action,), $attrs); 
     483    return pages_html_wrap('form', $body, $attrs); 
    471484} 
    472485 

  • releases/0.9/mod/pages/lib/pages.inc.php

    r1383 r1414  
    227227} 
    228228 
     229function pages_create_page($page) { 
     230    global $messages; 
     231    if (!is_object($page)) { 
     232        trigger_error(__FUNCTION__.": invalid argument (page: is not an object)", E_USER_ERROR); 
     233    } 
     234 
     235    if (empty($page->title) || empty($page->content)) { 
     236        trigger_error(__FUNCTION__.": invalid argument (page title or content empty)", E_USER_ERROR); 
     237    } 
     238 
     239    if (empty($page->name)) { 
     240        $page->name = $page->title; 
     241    } 
     242 
     243    if (empty($page->uri)) { 
     244        $page->uri = pages_build_uri($page->name); 
     245    } 
     246 
     247    $rs = insert_record('pages', $page); 
     248    if ($rs) { 
     249        $page->ident = $rs; 
     250        return $page; 
     251    } else { 
     252        return false;  
     253    } 
     254} 
     255 
    229256function pages_get_page($page_name, $owner=-1) { 
    230257 

  • releases/0.9/version.php

    r1188 r1414  
    1313   $release = '0.8';    // Human-friendly version name 
    1414 
     15   $build = ''; // revision number 
     16 
    1517?>