Changeset 1046

Timestamp:

03/26/07 12:27:53 (2 years ago)

Author:

sven

Message:

fixes for profile stuff: whitespace, html validation, php notices, cache-unfriendly queries, missing functions

Files:

• devel/lib/uploadlib.php (modified) (1 diff)
• devel/lib/userlib.php (modified) (2 diffs)
• devel/mod/newsclient/lib.php (modified) (3 diffs)
• devel/mod/profile/css (modified) (4 diffs)
• devel/mod/profile/lib.php (modified) (8 diffs)
• devel/mod/profile/profile.config.php (modified) (1 diff)
• devel/mod/profile_photo/lib.php (modified) (3 diffs)
• devel/mod/widget/ajax_delete_widget.php (modified) (1 diff)
• devel/mod/widget/css (modified) (1 diff)
• devel/mod/widget/delete.php (modified) (2 diffs)
• devel/mod/widget/edit.php (modified) (6 diffs)
• devel/mod/widget/insert.php (modified) (2 diffs)
• devel/mod/widget/lib.php (modified) (21 diffs)
• devel/mod/widget/manage_widgets.php (modified) (1 diff)
• devel/mod/widget/move.php (modified) (3 diffs)
• devel/profile/index.php (modified) (4 diffs)

devel/lib/uploadlib.php

@@ -223 +223 @@
-                }
-            }
-$savedsomething
+!empty($savedsomething)
-                $this->delete_other_files($destination, $exceptions);
-            }

devel/lib/userlib.php

@@ -97 +97 @@
-     * @return string Returns the user's name, or a blank string if something went wrong (eg the user didn't exist).
-     */
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    /**
-     * Returns the HTML to display a user's icon, with event hooks allowing for interception.
@@ -119 +120 @@
-     * @return string Returns the icon HTML, or the default icon if something went wrong (eg the user didn't exist).
-     */
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- $user_icon->html = "<img src=\"{$user_icon->url}\" border=\"0
- 
- 
+
+
+
+
+
+
+
+
+
+
+
+$user_icon->html = "<img src=\"{$user_icon->url}\" border=\"0\" alt=\"user icon
+
+
-                    return $user_icon->url;
- 
+
-                    return $user_icon->html;
-                }
- 
- 
- 
- 
- 
- return "<img src=\"{$CFG->wwwroot}_icon/user/-1{$extra}\" border=\"0
- 
- 
+
+
+
+
+
+return "<img src=\"{$CFG->wwwroot}_icon/user/-1{$extra}\" border=\"0\" alt=\"default user icon
+
+
-    
-// USER FLAGS //////////////////////////////////////////////////////////////////

devel/mod/newsclient/lib.php

@@ -82 +82 @@
-    global $CFG;
-    
+    // Delete users
+    listen_for_event("user","delete","newsclient_user_delete");
+    
-    //$CFG->widgets->display['feed'] = "newsclient_widget_display";
-    //$CFG->widgets->edit['feed'] = "newsclient_widget_edit";
@@ -179 +182 @@
-function newsclient_get_subscriptions_user($userid, $joined = false) {
-    
-       
-
+    
+
-    $userid = (int) $userid;
-    if (empty($joined)) {
@@ -197 +200 @@
-}
-
+function newsclient_user_delete($object_type, $event, $object) {
+    global $CFG, $data;
+    if (!empty($object->ident) && $object_type == "user" && $event == "delete") {
+        delete_records('feed_subscriptions','user_id',$object->ident);
+    }
+    return $object;
+}
+
+
-?>

devel/mod/profile/css

@@ -1 @@
-
+ type="text/css"
-
-/*
@@ -6 +6 @@
-
-img.profile-photo {
-   
-   
+       
+       
-}
-
-.profile_main p {
-   
+       
-}
-
-.profile_main p a {
-    
+       
-}
-
-.profile_main_bottom {
-    
+       
-}
-
-.profile_primary {
-    
-    
-    
-    
+       
+       
+       
+       
-}
-
-.profile_secondary {
-    
-    
-    
-    
+       
+       
+       
+       
-}
-
-.profile_bio {
-    
-    
+       
+       
-}
-
-.profile_widgets {
-    
-    
-    
+       
+       
+       
-}
-
-.profile_icon img {
-    
-    
+       
+       
-}
-
-.profile_widgets_left {
-    
-    
+       
+       
-}
-
-.profile_widgets_right {
-    
-    
+       
+       
-}
-
@@ -65 +65 @@
-
-#profile_widgets {
-   
+       
-}
-
-.profile_bio {
-   
-   
+       
+       
-}
-
-.widgets_even {
-   
-   
-   
-   
+       
+       
+       
+       
-}
-
-.widgets_odd {
-   
-   
-   
-   
+       
+       
+       
+       
-}
-
-.widget {
-    
-    
-    
+       
+       
+       
-}
-
-.widget .widget_content {
-    
+       
-}
-
-.widget .widget_content h3 {
-    
-    
+       
+       
-}
-
-.widget .widget_bottom {
-    
-    
-    
-    
-    
-    
+       
+       
+       
+       
+       
+       
-}
-
-.widget .widget_menu ul {
-    
-    
+       
+       
-}
-
-.widget .widget_menu ul li {
-    
+       
-}
-
-.widget .widget_menu ul li a {
-    
+       
-}
-
-.widget .widget_admin_menu {
-    
-    
+       
+       
-}
-
@@ -134 +134 @@
-
-.widget .widget_title {
-        
-        
-        
-        
-        
-        
-        
+               
+               
+               
+               
+               
+               
+               
-}
-
-.widget  .widget_content h2 a {
-    
-    
+       
+       
-}
-

devel/mod/profile/lib.php

@@ -30 +30 @@
-                                           'html' => '<a href="'.$CFG->wwwroot.'_icons/?context=profile&amp;profile_id='.$pgowner.'">'
-                                           . __gettext("Change site picture") . '</a>');
-$CFG->uses_YUI
-       
-               
-               
-   
-                       
-               
-               
-   }                       
+!empty($CFG->uses_YUI)
+    
+        
+        
+    
+                    
+        
+        
+    }                   
-            }
-        }
@@ -89 +89 @@
-                                );
-    /*
-       
+    
-                                        'name' => __gettext("Files widget"),
-                                        'description' => __gettext("Displays images of some of your files."),
@@ -114 +114 @@
-    if ($widget->type == 'profile::profile') {
-    
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-   
-       
-               
-       
-               
-       
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+        
+    
+        
+    
-    
-}
@@ -153 +153 @@
-function profile_show_thumbs($id_list,$list_type) {
-    global $profile_id, $page_owner;
-       
-
-       
-       
+    
+
+    
+    
-
-    $body  = "";
@@ -162 +162 @@
-    $cellnum = -1;
-    if ($list_type == 'files') {
-       
+    
-    } else {
-       
+    
-    }
-
-    foreach ($id_list as $key => $ident) {
-       
-       
-               
+    
+    
+        
-                               .'WHERE ident = ?',array($page_owner,$ident))) {
-                               
-                               
-                               
-                               
-                       
-               } else {                        
-
-       
-       
-       
-       
-       
-                       
-
-       
-       
-       
-       
-
-
-   
-       
-       
-       
-       
-       
-                               
-               
-               
-               
-               
-
+                
+                
+                
+                
+            
+        } else {            
+
+    
+    
+    
+    
+    
+            
+
+    
+    
+    
+    
+
+
+    
+    
+    
+    
+    
+    
+                
+        
+        
+        
+        
+
-END;
-
-               
-               
-               
-               
-               
-               
-               
-               
-               
-               
-
+
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+
-END;
-                       
-
+            
+
-    }
-
-    $body .= "\t</tr>\n</table>\n";
-       
-       
+    
+    
-}
-
-function profile_files_widget_display($userid) {
-       
-       
-       
-       
-               
-               
-           
-               
-           
-               
-       
-       
-               
-               
+    
+    
+    
+    
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
-        $menu = array(array('text' => __gettext('View all'), 'link' => $CFG->wwwroot.$username.'/files', 'title'=>$file_count .' '. ($file_count == 1 ? __gettext("file"):__gettext("files"))));
-       
+    
-        $widget_array = array('title'=>$title,'menu'=>$menu,'content'=>$content);
-    } else {
@@ -256 +256 @@
-    $html = '';
-    $friends = array();
-       
+    
-                               JOIN '.$CFG->prefix.'users u ON u.ident = f.friend
-                               WHERE f.owner = ? AND u.user_type = ? order by u.last_action desc LIMIT 9',array($userid,'person'))) {
-       
+    
-                               JOIN '.$CFG->prefix.'users u ON u.ident = f.friend
-                               WHERE f.owner = ? AND u.user_type = ?',array($userid,'person'));
@@ -266 +266 @@
-        }
-        if ($userid != $_SESSION['userid']) {
-       
-       
-       
-       
+    
+    
+    
+    
-        $title = __gettext('Friends');
-        $menu_array = array(array('text' => __gettext('View all Friends'), 'link' => $link, 'title'=>$friend_count->count .' '. ($friend_count->count == 1 ? __gettext("friend"):__gettext("friends"))));
-       
-       
+    
+    
-    } else {
-       
-       
-       
+    
+    
+    
-}
-
@@ -287 +287 @@
-    if ($widget->type == 'profile::profile') {
-    
-       
-       
-       
-       
-       
-       
-       
-       
-       
-
-       
-       
-       
-       
-
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-
-       
-       
-       
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
+    
+    
+    
+    
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
+    
+    
+    
-    } elseif ($widget->type == 'profile::files') {
-       
-       
+    
+    
-    }
-    

devel/mod/profile/profile.config.php

@@ -62 +62 @@
-                                                                    "invisible" => false,
-                                                                    "required" => false,
+                                                                    "user_type" => "",
-                                                                    ));
-        

devel/mod/profile_photo/lib.php

@@ -35 +35 @@
-            }
-            if (!empty($parameter[1])) {
-constraint1=w&size1=250&constraint2=h&size2=200
-
+amp;constraint1=w&size1=250&constraint2=h&size2=200\" alt=\"Profile photo
+label for=\"$cleanid\"><
-                $html .= __gettext("Click here to remove this photo.");
+                $html .= "</label>";
-            } else {
-                $html .= "<input name=\"profile_photo_".$parameter[3]."\" type=\"file\" /><br />";
-
+label for=\"$cleanid\"><
-                $html .= __gettext("Click here to verify that this is a photo of you and that it is not obscene or abusive.");
+                $html .= "</label>";
-            }
-        }
@@ -49 +51 @@
-    function profile_photo_display_output_field($parameter) {
-        global $CFG, $profile_id;
+        $html = '';
-        if ($parameter[1] == "profile_photo") {
-
-
-
+
+
-            } else {
-                $pictureglyph = __gettext("Click here to upload a photo");
-                $html = <<< END
-</p>
-
+ type="text/css"
-div#default-profile-icon {
-    width:250px;
@@ -82 +84 @@
-<div id="default-profile-icon">
-<p><a href="{$CFG->wwwroot}profile/edit.php?profile_id={$profile_id}">{$pictureglyph}</a></p>
-                
+
-<p>
-END;

devel/mod/widget/ajax_delete_widget.php

@@ -2 +2 @@
-
-// Load Elgg framework
-        
-
+
+
-$id = optional_param('id',0,PARAM_INT);
-
-if (isloggedin()) {
-
+
+
+
+
+
+
+
+
-            
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-}
-

devel/mod/widget/css

@@ -2 +2 @@
-
-#profile_widgets {
-   
+       
-}
-
-.widgets_even {
-   
-   
+       
+       
-}
-
-.widgets_odd {
-   
-   
+       
+       
-}
-
-.widget {
-    
-    
-    
+       
+       
+       
-}
-
-.widget .widget_content {
-    
+       
-}
-.widget .widget_content h3 {
-    
-    
+       
+       
-}
-
-.widget .widget_menu {
-     
-