Changeset 556

Show
Ignore:
Timestamp:
09/15/06 14:37:36 (2 years ago)
Author:
sven
Message:

replacing run("user:flags:*et") with user_flag_*et()

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • devel/lib/dbsetup.php

    r542 r556  
    4848} 
    4949 
    50 if (run("users:flags:get", array("admin",$_SESSION['userid']))) { 
     50if (user_flag_get("admin",$_SESSION['userid'])) { 
    5151     
    5252    if (empty($CFG->version)) { 

  • devel/lib/elgglib.php

    r550 r556  
    34083408     
    34093409    $ok = true; 
    3410     if (run("users:flags:get", array("banned", $user->ident))) { // this needs to change. 
     3410    if (user_flag_get("banned", $user->ident)) { // this needs to change. 
    34113411        $ok = false; 
    34123412        $user = false; 
    …… 
    34363436             
    34373437            /*** TODO: Create Proper Abstraction Interface - don't use file binding -- ugh ***/ 
    3438             if (!run("users:flags:get", array("banned",$USER->ident))) { 
     3438            if (!user_flag_get("banned",$USER->ident)) { 
    34393439                $USER = init_user_var($USER); 
    34403440                return true; 

  • devel/lib/templates.php

    r520 r556  
    450450    } 
    451451 
    452     if (defined("context") && context == "admin" && logged_on && run("users:flags:get",array("admin", $_SESSION['userid']))) { 
     452    if (defined("context") && context == "admin" && logged_on && user_flag_get("admin", $_SESSION['userid'])) { 
    453453        $PAGE->menu_sub[] = array( 
    454454                                  'name' => 'admin', 

  • devel/lib/userlib.php

    r537 r556  
    101101    // Adds a flag 
    102102    function user_flag_set($flag_name, $value, $user_id) { 
    103         // Unset the flag first 
    104         user_flag_unset($flag_name, $user_id); 
    105  
    106         // Then add data 
    107         $flag = new StdClass; 
    108         $flag->flag = $flag_name; 
    109         $flag->user_id = $user_id; 
    110         $flag->value = $value; 
    111         return insert_record('user_flags',$flag); 
     103        $flag_name = trim($flag_name); 
     104        if ($flag_name) { 
     105            // Unset the flag first 
     106            user_flag_unset($flag_name, $user_id); 
     107     
     108            // Then add data 
     109            $flag = new StdClass; 
     110            $flag->flag = $flag_name; 
     111            $flag->user_id = $user_id; 
     112            $flag->value = $value; 
     113            return insert_record('user_flags',$flag); 
     114        } 
    112115    } 
    113116     

  • devel/mod/profile/lib.php

    r551 r556  
    5959    global $page_owner; 
    6060     
    61     if ($object === "profile" && ($page_owner == $_SESSION['userid'] || run("users:flags:get", array("admin", $_SESSION['userid'])))) { 
     61    if ($object === "profile" && ($page_owner == $_SESSION['userid'] || user_flag_get("admin", $_SESSION['userid']))) { 
    6262        return true; 
    6363    } 

  • devel/units/admin/admin_actions.php

    r518 r556  
    1616    }         
    1717 
    18     if (run("users:flags:get", array("admin", $USER->ident))) { 
     18    if (user_flag_get("admin", $USER->ident)) { 
    1919        switch ($action) { 
    2020        case "content:flags:delete": 
    …… 
    7575                } 
    7676                foreach ($flags as $flag => $value) { 
    77                     $flag = trim(stripslashes($flag)); // users:flags:set escapes its params 
    78                     $value = trim(stripslashes($value)); // users:flags:set escapes its params 
    79                     run("users:flags:set",array($flag,$id,$value)); 
     77                    $flag = trim($flag); 
     78                    $value = trim($value); 
     79                    user_flag_set($flag, $value, $id); 
    8080                    $messages[] = sprintf(gettext("User flag '%s' set to '%s'"), $flag, $value); 
    8181                } 

  • devel/units/admin/admin_contentflags.php

    r269 r556  
    33// Content flag list 
    44     
    5 if (logged_on && run("users:flags:get", array("admin", $USER->ident))) { 
     5if (logged_on && user_flag_get("admin", $USER->ident)) { 
    66     
    77    $run_result .= "<p>" . gettext("The following pages have been flagged as having obscene or inappropriate content. They are ordered by number of complaints.") . "</p>"; 

  • devel/units/admin/admin_main.php

    r540 r556  
    55// Site stats 
    66 
    7 if (logged_on && run("users:flags:get", array("admin", $USER->ident))) { 
     7if (logged_on && user_flag_get("admin", $USER->ident)) { 
    88     
    99        $run_result .= "<h2>" . gettext("Site statistics") . "</h2>"; 

  • devel/units/admin/admin_spam.php

    r269 r556  
    33// Users panel 
    44 
    5 if (logged_on && run("users:flags:get", array("admin", $USER->ident))) { 
     5if (logged_on && user_flag_get("admin", $USER->ident)) { 
    66     
    77    $run_result .= "<p>" . gettext("Add regular expressions below, one per line, to block spam. For example, 'foo' will block all comments containing the word foo, (foo|bar) will block comments containing the word foo or bar.") . "</p>"; 

  • devel/units/admin/admin_userdetails.php

    r269 r556  
    1010// these actions on yourself. 
    1111 
    12 if (logged_on && run("users:flags:get", array("admin", $USER->ident)) && $page_owner != $USER->ident) { 
     12if (logged_on && user_flag_get("admin", $USER->ident) && $page_owner != $USER->ident) { 
    1313             
    1414    // Get user details 
    …… 
    4545        $run_result .= "<h3>" . gettext("User flags:") . "</h3>"; 
    4646        // Is the user an administrator? 
    47         if (run("users:flags:get", array("admin", $page_owner))) { 
     47        if (user_flag_get("admin", $page_owner)) { 
    4848            $checkedyes = "checked = \"true\""; 
    4949            $checkedno = ""; 
    …… 
    6161         
    6262        // Is the user banned? 
    63         if (run("users:flags:get", array("banned", $page_owner))) { 
     63        if (user_flag_get("banned", $page_owner)) { 
    6464            $checkedyes = "checked = \"true\""; 
    6565            $checkedno = ""; 

  • devel/units/admin/admin_users.php

    r339 r556  
    33// List of users in the system 
    44     
    5 if (logged_on && run("users:flags:get", array("admin", $_SESSION['userid']))) { 
     5if (logged_on && user_flag_get("admin", $_SESSION['userid'])) { 
    66     
    77    // We're only displaying 50 users a page, so if this variable exists it will serve as the offset 

  • devel/units/admin/admin_users_add.php

    r269 r556  
    33    // Add multiple users 
    44     
    5         if (logged_on && run("users:flags:get", array("admin", $_SESSION['userid']))) { 
     5        if (logged_on && user_flag_get("admin", $_SESSION['userid'])) { 
    66             
    77            global $admin_users_add; 

  • devel/units/admin/permissions_check.php

    r269 r556  
    1515        global $page_owner; 
    1616         
    17         if (logged_on && run("users:flags:get", array("admin", $_SESSION['userid']))) { 
     17        if (logged_on && user_flag_get("admin", $_SESSION['userid'])) { 
    1818            $run_result = true; 
    1919        } 

  • devel/units/communities/communities_actions.php

    r530 r556  
    5757                     if ($friend->moderation == "no") { 
    5858                         $messages[] = sprintf(gettext("You joined %s."), stripslashes($friend->name)); 
    59                          if (run("users:flags:get",array("emailnotifications",$owner->ident))) { 
     59                         if (user_flag_get("emailnotifications",$owner->ident)) { 
    6060                             $message_body = sprintf(gettext("%s has joined %s!\n\nTo visit this user's profile, click on the following link:\n\n\t". 
    6161                                                                     "%s\n\nTo view all community members, click here:\n\n\t%s\n\nRegards,\n\nThe %s team."), 
    …… 
    6666                     } else if ($friend->moderation == "yes") { 
    6767                         $messages[] = sprintf(gettext("Membership of %s needs to be approved. Your request has been added to the list."), stripslashes($friend->name)); 
    68                          if (run("users:flags:get",array("emailnotifications",$owner->ident))) { 
     68                         if (user_flag_get("emailnotifications",$owner->ident)) { 
    6969                             $message_body = sprintf(gettext("%s has applied to join %s!\n\nTo visit this user's profile, click on the following link:\n\n\t". 
    7070                                                                     "%s\n\nTo view all membership requests and approve or deny this user, click here:\n\n\t%s\n\nRegards,\n\nThe %s team."), 

  • devel/units/friends/friends_actions.php

    r530 r556  
    2323                        if (user_info("user_type",$friend_id) == "person") { 
    2424                            $messages[] = sprintf(gettext("%s was added to your friends list."),$friend->name); 
    25                             if (run("users:flags:get",array("emailnotifications",$friend_id))) { 
     25                            if (user_flag_get("emailnotifications",$friend_id)) { 
    2626                                $u = get_record('users','ident',$friend_id); 
    2727                                $message_body = sprintf(gettext("%s has added you as a friend!\n\nTo visit this user's profile, click on the following link:\n\n\t". 
    …… 
    4141                        if (user_info("user_type",$friend_id) == "person") { 
    4242                            $messages[] = sprintf(gettext("%s has elected to moderate friendship requests. Your request has been added to their moderation queue."),$friend->name); 
    43                             if (run("users:flags:get",array("emailnotifications",$friend_id))) { 
     43                            if (user_flag_get("emailnotifications",$friend_id)) { 
    4444                                $u = get_record('users','ident',$friend_id); 
    4545                                $message_body = sprintf(gettext("%s has requested to add you as a friend!\n\nTo visit this user's profile, click on the following link:\n\n\t". 

  • devel/units/tinymce/tinymce_userdetails.php

    r269 r556  
    1010 
    1111    // Query result 
    12     if ($result = get_field('user_flags','value','flag','visualeditor','user_id',$id)) { 
     12    if ($result = user_flag_get('visualeditor', $id)) { 
    1313        $value = $result; 
    1414    } else { 
    1515        // No result, store a default value 
    16         $uf = new StdClass; 
    17         $uf->flag = 'visualeditor'; 
    18         $uf->value = $value; 
    19         $uf->user_id = $id; 
    20         insert_record('user_flags',$uf); 
     16        user_flag_set('visualeditor', $value, $id); 
    2117    } 
    2218 

  • devel/units/tinymce/tinymce_userdetails_actions.php

    r269 r556  
    77 
    88    if (logged_on && !empty($action)  
    9         && run("permissions:check", 
    10                array("userdetails:change",$id))) { 
     9        && run("permissions:check", array("userdetails:change",$id))) { 
    1110        if (!empty($value) && in_array($value,array('yes','no'))) { 
    1211 
    …… 
    1615                $messages[] .= gettext("Your editor preferences have been saved"); 
    1716            } else { 
    18                 if (set_field('user_flags','value',$value,'flag','visualeditor','user_id',$id)) { 
     17                if (user_flag_set('visualeditor', $value, $id)) { 
    1918                    $messages[] .= gettext("Your editor preferences have been changed"); 
    2019                } else { 

  • devel/units/users/userdetails_actions.php

    r454 r556  
    5151            if ($usertype == 'person' && !empty($publiccomments)) { 
    5252                if ($publiccomments == "yes") { 
    53                     run("users:flags:set",array("publiccomments",$id,"1")); 
     53                    user_flag_set("publiccomments", "1", $id); 
    5454                    $messages[] = gettext("Public comments and discussion set to 'on'."); 
    5555                } else { 
    56                     run("users:flags:unset",array("publiccomments",$id)); 
     56                    user_flag_unset("publiccomments",$id); 
    5757                    $messages[] = gettext("Public comments and discussion set to 'off'."); 
    5858                } 
    …… 
    6262            if ($usertype == 'person' && isset($receiveemails)) { 
    6363                if ($receiveemails == "yes") { 
    64                     run("users:flags:set",array("emailreplies",$id,"1")); 
     64                    user_flag_set("emailreplies", "1", $id); 
    6565                    $messages[] = gettext("Email comments and discussion set to 'on'."); 
    6666                } else { 
    67                     run("users:flags:unset",array("emailreplies",$id)); 
     67                    user_flag_unset("emailreplies",$id); 
    6868                    $messages[] = gettext("Email comments and discussion set to 'off'."); 
    6969                } 
    …… 
    7373            if ($usertype == 'person' && isset($receiveemails)) { 
    7474                if ($receiveemails == "yes") { 
    75                     run("users:flags:set",array("emailnotifications",$id,"1")); 
     75                    user_flag_set("emailnotifications", "1", $id); 
    7676                    $messages[] = gettext("Email notifications set to 'on'."); 
    7777                } else { 
    78                     run("users:flags:unset",array("emailnotifications",$id)); 
     78                    user_flag_unset("emailnotifications",$id); 
    7979                    $messages[] = gettext("Email notifications set to 'off'."); 
    8080                } 

  • devel/units/users/userdetails_edit.php

    r432 r556  
    101101END; 
    102102 
    103     $emailreplies = run("users:flags:get",array("publiccomments",$page_owner)); 
     103    $emailreplies = user_flag_get("publiccomments",$page_owner); 
    104104    if ($emailreplies) { 
    105105        $body .= templates_draw(array( 
    …… 
    130130END; 
    131131 
    132     $emailreplies = run("users:flags:get",array("emailreplies",$page_owner)); 
     132    $emailreplies = user_flag_get("emailreplies",$page_owner); 
    133133    if ($emailreplies) { 
    134134        $body .= templates_draw(array( 
    …… 
    159159END; 
    160160     
    161     $emailreplies = run("users:flags:get",array("emailnotifications",$page_owner)); 
     161    $emailreplies = user_flag_get("emailnotifications",$page_owner); 
    162162    if ($emailreplies) { 
    163163        $body .= templates_draw(array( 

  • devel/units/weblogs/weblogs_actions.php

    r530 r556  
    114114                if (run("spam:check",$comment->body) != true) { 
    115115                    // If we're logged on or comments are public, add one 
    116                     if (logged_on || run("users:flags:get",array("publiccomments",$post->owner))) { 
     116                    if (logged_on || user_flag_get("publiccomments",$post->owner)) { 
    117117                        $comment->owner = $USER->ident; 
    118118                        $comment->posted = time(); 
    …… 
    129129 
    130130                        // Email comment if applicable 
    131                         if (run("users:flags:get",array("emailreplies",$post->owner))) { 
     131                        if (user_flag_get("emailreplies", $post->owner)) { 
    132132                            if ($email = get_record('users','ident',$post->owner)) { 
    133133                                $message = gettext(sprintf("You have received a comment from %s on your blog post '%s'. It reads as follows:", $comment->postedname, stripslashes($post->title))); 

  • devel/units/weblogs/weblogs_posts_view.php

    r467 r556  
    191191                                          ); 
    192192             
    193             if (logged_on || run("users:flags:get",array("publiccomments",$post->owner))) { 
     193            if (logged_on || user_flag_get("publiccomments",$post->owner)) { 
    194194                $run_result .= run("weblogs:comments:add",$post); 
    195195            } else {