Changeset 836

Timestamp:

01/19/07 13:29:46 (2 years ago)

Author:

sven

Message:

fix and extra messages for invite.
strip out a bunch of dead code from elgglib.

Files:

• devel/_invite/index.php (modified) (1 diff)
• devel/_invite/join.php (modified) (1 diff)
• devel/config-dist.php (modified) (2 diffs)
• devel/lib/elgglib.php (modified) (5 diffs)
• devel/units/invite/invite_actions.php (modified) (2 diffs)
• devel/units/invite/invite_join.php (modified) (5 diffs)

devel/_invite/index.php

@@ -15 +15 @@
-    // You must be logged on to view this!
-        if (logged_on && $CFG->publicinvite == true) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-        
-        
-        
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
+
+
-
-?>

devel/_invite/join.php

@@ -8 +8 @@
-        
-        run("invite:init");
-        
+
-        
-        $title = sprintf(__gettext("Join %s"),sitename);

devel/config-dist.php

@@ -187 +187 @@
-
-
-
+
+
-
-// $CFG->admin
-
-
+
-// $CFG->auth
-// $CFG->cachetext
@@ -197 +197 @@
-// $CFG->dbsessions
-// $CFG->detect_unchecked_vars
-// $CFG->editorbackgroundcolor
-// $CFG->editorfontfamily
-// $CFG->editorfontlist
-// $CFG->editorfontsize
-// $CFG->editorhidebuttons
-// $CFG->editorkillword
-// $CFG->editorspelling
-// $CFG->filterall
-// $CFG->framename
-
-
-
-
-
+
+
-// $CFG->logsql
-// $CFG->maxbytes
-// $CFG->newsclient_lastcron
-// $CFG->openid_comments_allowed
-// $CFG->opentogoogle

devel/lib/elgglib.php

@@ -358 +358 @@
-function report_session_error() {
-    global $CFG, $FULLME;
-    if (empty($CFG->lang)) {
-        $CFG->lang = "en";
-    }
-
-    //clear session cookies
@@ -375 +372 @@
-}
-
+// never called
-/**
- * For security purposes, this function will check that the currently
@@ -383 +381 @@
- * @return bool
- */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// 
+// 
+
+// 
+// 
+// 
+
+// 
+// 
+// 
+
+// 
+// 
+// 
+
+// 
+// 
-
-
@@ -2886 +2884 @@
-
-/**
- * Prints a basic textarea field.
- *
- * @uses $CFG
- * @param boolean $usehtmleditor ?
- * @param int $rows ?
- * @param int $cols ?
- * @param null $width <b>Legacy field no longer used!</b>  Set to zero to get control over mincols
- * @param null $height <b>Legacy field no longer used!</b>  Set to zero to get control over minrows
- * @param string $name ?
- * @param string $value ?
- * @param int $courseid ?
- * @todo Finish documenting this function
- */
-function print_textarea($usehtmleditor, $rows, $cols, $width, $height, $name, $value='', $courseid=0) {
-/// $width and height are legacy fields and no longer used as pixels like they used to be.
-/// However, you can set them to zero to override the mincols and minrows values below.
-
-    global $CFG, $course;
-    static $scriptcount; // For loading the htmlarea script only once.
-
-    $mincols = 65;
-    $minrows = 10;
-
-    if (empty($courseid)) {
-        if (!empty($course->id)) {  // search for it in global context
-            $courseid = $course->id;
-        }
-    }
-
-    if (empty($scriptcount)) {
-        $scriptcount = 0;
-    }
-
-    if ($usehtmleditor) {
-
-        if (!empty($courseid) and isteacher($courseid)) {
-            echo ($scriptcount < 1) ? '<script type="text/javascript" src="'. $CFG->wwwroot .'lib/editor/htmlarea.php?id='. $courseid .'"></script>'."\n" : '';
-        } else {
-            echo ($scriptcount < 1) ? '<script type="text/javascript" src="'. $CFG->wwwroot .'lib/editor/htmlarea.php"></script>'."\n" : '';
-        }
-        echo ($scriptcount < 1) ? '<script type="text/javascript" src="'. $CFG->wwwroot .'lib/editor/lang/en.php"></script>'."\n" : '';
-        $scriptcount++;
-
-        if ($height) {    // Usually with legacy calls
-            if ($rows < $minrows) {
-                $rows = $minrows;
-            }
-        }
-        if ($width) {    // Usually with legacy calls
-            if ($cols < $mincols) {
-                $cols = $mincols;
-            }
-        }
-    }
-
-    echo '<textarea id="edit-'. $name .'" name="'. $name .'" rows="'. $rows .'" cols="'. $cols .'">';
-    if ($usehtmleditor) {
-        echo htmlspecialchars(stripslashes_safe($value), ENT_COMPAT, 'utf-8'); // needed for editing of cleaned text!
-    } else {
-        p ($value);
-    }
-    echo '</textarea>'."\n";
-}
-
-/**
- * Legacy function, provided for backward compatability.
- * This method now simply calls {@link use_html_editor()}
- *
- * @deprecated Use {@link use_html_editor()} instead.
- * @param string $name Form element to replace with HTMl editor by name
- * @todo Finish documenting this function
- */
-function print_richedit_javascript($form, $name, $source='no') {
-    use_html_editor($name);
-}
-
-
-/**
- * Sets up the HTML editor on textareas in the current page.
- * If a field name is provided, then it will only be
- * applied to that field - otherwise it will be used
- * on every textarea in the page.
- *
- * In most cases no arguments need to be supplied
- *
- * @param string $name Form element to replace with HTMl editor by name
- */
-function use_html_editor($name='', $editorhidebuttons='') {
-    echo '<script language="javascript" type="text/javascript" defer="defer">'."\n";
-    print_editor_config($editorhidebuttons);
-    if (empty($name)) {
-        echo "\n".'HTMLArea.replaceAll(config);'."\n";
-    } else {
-        echo "\nHTMLArea.replace('edit-$name', config);\n";
-    }
-    echo '</script>'."\n";
-}
-
-
-/**
- * Prints form items with the names $day, $month and $year
- *
@@ -3267 +3165 @@
-    return $text;
-}
-
-
-/**
- * Prints out the HTML editor config.
- *
- * @uses $CFG
- */
- function print_editor_config($editorhidebuttons='') {
-
-    global $CFG;
-
-    // print new config
-    echo 'var config = new HTMLArea.Config();'."\n";
-    echo "config.pageStyle = \"body {";
-    if(!(empty($CFG->editorbackgroundcolor))) {
-        echo " background-color: $CFG->editorbackgroundcolor;";
-    }
-
-    if(!(empty($CFG->editorfontfamily))) {
-        echo " font-family: $CFG->editorfontfamily;";
-    }
-
-    if(!(empty($CFG->editorfontsize))) {
-        echo " font-size: $CFG->editorfontsize;";
-    }
-
-    echo " }\";\n";
-    echo "config.killWordOnPaste = ";
-    echo(empty($CFG->editorkillword)) ? "false":"true";
-    echo ';'."\n";
-    echo 'config.fontname = {'."\n";
-
-    $fontlist = isset($CFG->editorfontlist) ? explode(';', $CFG->editorfontlist) : array();
-    $i = 1;                     // Counter is used to get rid of the last comma.
-
-    foreach($fontlist as $fontline) {
-        if(!empty($fontline)) {
-            if ($i > 1) {
-                echo ','."\n";
-            }
-            list($fontkey, $fontvalue) = split(':', $fontline);
-            echo '"'. $fontkey ."\":\t'". $fontvalue ."'";
-
-            $i++;
-        }
-    }
-    echo '};';
-
-    if (!empty($editorhidebuttons)) {
-        echo "\nconfig.hideSomeButtons(\" ". $editorhidebuttons ." \");\n";
-    } else if (!empty($CFG->editorhidebuttons)) {
-        echo "\nconfig.hideSomeButtons(\" ". $CFG->editorhidebuttons ." \");\n";
-    }
-
-    if(!empty($CFG->editorspelling) && !empty($CFG->aspellpath)) {
-        print_speller_code($usehtmleditor=true);
-    }
-}
-
-/**
- * Prints out code needed for spellchecking.
- * Original idea by Ludo (Marc Alier).
- *
- * @uses $CFG
- * @param boolean $usehtmleditor ?
- * @todo Finish documenting this function
- */
-function print_speller_code ($usehtmleditor=false) {
-    global $CFG;
-
-    if(!$usehtmleditor) {
-        echo "\n".'<script language="javascript" type="text/javascript">'."\n";
-        echo 'function openSpellChecker() {'."\n";
-        echo "\tvar speller = new spellChecker();\n";
-        echo "\tspeller.popUpUrl = \"" . $CFG->wwwroot ."lib/speller/spellchecker.html\";\n";
-        echo "\tspeller.spellCheckScript = \"". $CFG->wwwroot ."lib/speller/server-scripts/spellchecker.php\";\n";
-        echo "\tspeller.spellCheckAll();\n";
-        echo '}'."\n";
-        echo '</script>'."\n";
-    } else {
-        echo "\nfunction spellClickHandler(editor, buttonId) {\n";
-        echo "\teditor._textArea.value = editor.getHTML();\n";
-        echo "\tvar speller = new spellChecker( editor._textArea );\n";
-        echo "\tspeller.popUpUrl = \"" . $CFG->wwwroot ."lib/speller/spellchecker.html\";\n";
-        echo "\tspeller.spellCheckScript = \"". $CFG->wwwroot ."lib/speller/server-scripts/spellchecker.php\";\n";
-        echo "\tspeller._moogle_edit=1;\n";
-        echo "\tspeller._editor=editor;\n";
-        echo "\tspeller.openChecker();\n";
-        echo '}'."\n";
-    }
-}
-
-/**
- * Print button for spellchecking when editor is disabled
- */
-function print_speller_button () {
-    echo '<input type="button" value="Check spelling" onclick="openSpellChecker();" />'."\n";
-}
-
-
-

devel/units/invite/invite_actions.php

@@ -21 +21 @@
-             if (logged_on || ($CFG->publicinvite == true)) {
-                 if (($CFG->maxusers == 0 || (count_users('person') < $CFG->maxusers))) {
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                             }
-                             $url = url . "_invite/join.php?invitecode=" . $invite->code;
-                             if (!logged_on) {
-                                 $greetingstext = sprintf(__gettext("Thank you for registering with %s."),$sitename);
-                                 $subjectline = sprintf(__gettext("%s account verification"),$sitename);
-                                 $from_email = email;
-                             } else {
-                                 $greetingstext = $USER->name . " " . __gettext("has invited you to join") ." $sitename, ". __gettext("a learning landscape system.") ."";
-                                 $subjectline = $USER->name . " " . __gettext("has invited you to join") ." $sitename";
-                                 $from_email = $USER->email;
-                             }
-                             $emailmessage = sprintf(__gettext("Dear %s,\n\n%s %s\n\nTo join, visit the following URL:\n\n\t%s\n\n"
-                                                             ."Your email address has not been passed onto any third parties,"
-                                                             ." and will be removed from our system within seven days.\n\nRegards,\n\nThe %s team.")
-                                                     ,$strippedname,$greetingstext,$invitetext,$url, $sitename);
-                             $emailmessage = wordwrap($emailmessage);
-                             $messages[] = sprintf(__gettext("Your invitation was sent to %s at %s. It will be valid for seven days."),$strippedname,$invite->email);
-                             email_to_user($invite,null,$subjectline,$emailmessage);
-                         } else {
-sprintf(__gettext("User %s already has that email address. Invitation not sent."),$account->username
+__gettext("Someone with that email address has already been invited to the system. "
-                         }
-                     } else {
-Someone with that email address has already been invited to the system. 
+Invitation failed: The email address was not valid.
-                     }
-                 } else {
-Invitation failed: The email address was not valid
+Error: This community has reached its maximum number of users
-                 }
-             } else {
-                 $messages[] = __gettext("Error: This community has reached its maximum number of users.");
-             }
-             } else {
-                 $messages[] = __gettext("Invitation failed: you are not logged in.");
@@ -81 +81 @@
-             if (!($CFG->maxusers == 0 || (count_users('person') < $CFG->maxusers))) {
-                 $messages[] = __gettext("Unfortunately this community has reached its account limit and you are unable to join at this time.");
+                 break;
-             }
-             if (empty($over13)) {

devel/units/invite/invite_join.php

@@ -3 +3 @@
-global $CFG;
-// Join
-
+
-$sitename = sitename;
-$textlib = textlib_get_instance();
@@ -11 +11 @@
-    if ($details = get_record('invitations','code',$code)) {
-        $name = optional_param('join_name',$details->name);
-
-        $username = optional_param('join_username');
-        if (empty($username)) {
@@ -32 +31 @@
-        $age = __gettext("Submitting the form below indicates acceptance of these terms. Please note that currently you must be at least 13 years of age to join the site."); // gettext variable
-        $run_result .= <<< END
-    
+
-    <p>
-        $thankYou
@@ -43 +42 @@
-        $age
-    </p>
-
-    <form action="" method="post">
-        
+
-END;
-        
+
-        $run_result .= templates_draw(array(
-                                            'context' => 'databoxvertical',
@@ -83 +81 @@
-            </p>
-        </form>
-                
-END;
-
+
-    } else {
-        
-
+
+
+
+
+
+
+
+
+
-        $run_result .= <<< END
-    
+
-    <p>
-        $invalid
-    </p>
-        
+
-END;
-        
+
-    }
-    
-} else {
-
+
+
+
+
+
-    $run_result .= <<< END
-            
+
-    <p>
-        $invite
-    </p>
-            
+
-END;
-        
+
-}
-