forked from GNUsocial/gnu-social
normalizing tags for status_network
This commit is contained in:
@@ -39,11 +39,10 @@ if (count($args) < 1) {
|
||||
}
|
||||
|
||||
$nickname = $args[0];
|
||||
|
||||
$sn = Status_network::memGet('nickname', $nickname);
|
||||
|
||||
if (empty($sn)) {
|
||||
print "No such site.\n";
|
||||
print "No such site ($nickname).\n";
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
@@ -54,16 +53,13 @@ if (count($args) == 1) {
|
||||
exit(0);
|
||||
}
|
||||
$tag = $args[1];
|
||||
|
||||
$i = array_search($tag, $tags);
|
||||
|
||||
if ($i !== false) {
|
||||
if (have_option('d', 'delete')) { // Delete
|
||||
unset($tags[$i]);
|
||||
|
||||
$orig = clone($sn);
|
||||
$sn->tags = implode('|', $tags);
|
||||
$result = $sn->update($orig);
|
||||
$result = $sn->setTags($tags);
|
||||
if (!$result) {
|
||||
print "Couldn't update.\n";
|
||||
exit(-1);
|
||||
@@ -78,9 +74,7 @@ if ($i !== false) {
|
||||
exit(-1);
|
||||
} else {
|
||||
$tags[] = $tag;
|
||||
$orig = clone($sn);
|
||||
$sn->tags = implode('|', $tags);
|
||||
$result = $sn->update($orig);
|
||||
$result = $sn->setTags($tags);
|
||||
if (!$result) {
|
||||
print "Couldn't update.\n";
|
||||
exit(-1);
|
||||
|
@@ -44,8 +44,8 @@ mysql -h $DBHOST -u $ADMIN --password=$ADMINPASS $SITEDB << ENDOFCOMMANDS
|
||||
|
||||
GRANT ALL ON $database.* TO '$username'@'localhost' IDENTIFIED BY '$password';
|
||||
GRANT ALL ON $database.* TO '$username'@'%' IDENTIFIED BY '$password';
|
||||
INSERT INTO status_network (nickname, dbhost, dbuser, dbpass, dbname, sitename, created, tags)
|
||||
VALUES ('$nickname', '$DBHOSTNAME', '$username', '$password', '$database', '$sitename', now(), '$tags');
|
||||
INSERT INTO status_network (nickname, dbhost, dbuser, dbpass, dbname, sitename, created)
|
||||
VALUES ('$nickname', '$DBHOSTNAME', '$username', '$password', '$database', '$sitename', now());
|
||||
|
||||
ENDOFCOMMANDS
|
||||
|
||||
@@ -56,6 +56,8 @@ done
|
||||
|
||||
php $PHPBASE/scripts/checkschema.php -s"$server"
|
||||
|
||||
php $PHPBASE/scripts/settag.php -s"$server" "$nickname" "$tags"
|
||||
|
||||
php $PHPBASE/scripts/registeruser.php \
|
||||
-s"$server" \
|
||||
-n"$nickname" \
|
||||
|
Reference in New Issue
Block a user