Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / scripts / updateurls.php

diff --git a/scripts/updateurls.php b/scripts/updateurls.php
old mode 100644 (file)
new mode 100755 (executable)
index 01b3c22..80b4ffc
--- a/scripts/updateurls.php
+++ b/scripts/updateurls.php
@@ -29,7 +29,7 @@ update stored URLs in the system
 
 END_OF_UPDATEURLS_HELP;
 
-require_once INSTALLDIR.'/scripts/commandline.inc';
+require_once INSTALLDIR.'/scripts/commandline.inc.php';
 
 function main()
 {
@@ -51,14 +51,8 @@ function updateUserUrls()
                 $profile = $user->getProfile();
 
                 updateProfileUrl($profile);
-                updateAvatarUrls($profile);
-
-                // Broadcast for remote users
-
-                common_broadcast_profile($profile);
-
             } catch (Exception $e) {
-                printv("Error updating URLs: " . $e->getMessage());
+                echo "Error updating URLs: " . $e->getMessage();
             }
             printfv("DONE.");
         }
@@ -72,36 +66,6 @@ function updateProfileUrl($profile)
     $profile->update($orig);
 }
 
-function updateAvatarUrls($profile)
-{
-    $avatar = new Avatar();
-
-    $avatar->profile_id = $profile->id;
-    if ($avatar->find()) {
-        while ($avatar->fetch()) {
-            $orig_url = $avatar->url;
-            $avatar->url = Avatar::url($avatar->filename);
-            if ($avatar->url != $orig_url) {
-                $sql =
-                  "UPDATE avatar SET url = '" . $avatar->url . "' ".
-                  "WHERE profile_id = " . $avatar->profile_id . " ".
-                  "AND width = " . $avatar->width . " " .
-                  "AND height = " . $avatar->height . " ";
-
-                if ($avatar->original) {
-                    $sql .= "AND original = 1 ";
-                }
-
-                if (!$avatar->query($sql)) {
-                    throw new Exception("Can't update avatar for user " . $profile->nickname . ".");
-                } else {
-                    $touched = true;
-                }
-            }
-        }
-    }
-}
-
 function updateGroupUrls()
 {
     printfnq("Updating group URLs...\n");
@@ -112,7 +76,7 @@ function updateGroupUrls()
         while ($group->fetch()) {
             try {
                 printfv("Updating group {$group->nickname}...");
-                $orig = User_group::staticGet('id', $group->id);
+                $orig = User_group::getKV('id', $group->id);
                 if (!empty($group->original_logo)) {
                     $group->original_logo = Avatar::url(basename($group->original_logo));
                     $group->homepage_logo = Avatar::url(basename($group->homepage_logo));
@@ -129,7 +93,7 @@ function updateGroupUrls()
                 $group->update($orig);
                 printfv("DONE.");
             } catch (Exception $e) {
-                printv("Can't update avatars for group " . $group->nickname . ": ". $e->getMessage());
+                echo "Can't update avatars for group " . $group->nickname . ": ". $e->getMessage();
             }
         }
     }