diff options
| -rw-r--r-- | INSTALL.txt | 15 | ||||
| -rw-r--r-- | boot.php | 2 | ||||
| -rw-r--r-- | include/items.php | 2 | ||||
| -rw-r--r-- | index.php | 4 | ||||
| -rw-r--r-- | mod/display.php | 7 | ||||
| -rw-r--r-- | mod/network.php | 7 | ||||
| -rw-r--r-- | mod/photos.php | 10 | ||||
| -rw-r--r-- | mod/profile.php | 7 | ||||
| -rw-r--r-- | util/strings.php | 5 | ||||
| -rw-r--r-- | util/typo.php | 12 | ||||
| -rw-r--r-- | view/de/like.tpl | 5 | ||||
| -rw-r--r-- | view/de/strings.php | 2 | ||||
| -rw-r--r-- | view/en/like.tpl | 5 | ||||
| -rw-r--r-- | view/fr/like.tpl | 5 | ||||
| -rw-r--r-- | view/fr/strings.php | 2 | ||||
| -rw-r--r-- | view/it/like.tpl | 5 | ||||
| -rw-r--r-- | view/it/strings.php | 2 | ||||
| -rw-r--r-- | view/like.tpl | 5 |
18 files changed, 67 insertions, 35 deletions
diff --git a/INSTALL.txt b/INSTALL.txt index 85114dee5..8de306b7d 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -34,7 +34,7 @@ php.ini file - Mysql 5.x - ability to schedule jobs with cron (Linux/Mac) or Scheduled Tasks -(Windows) [Note: other options are presented in Section 7 of this document] +(Windows) [Note: other options are presented in Section 8 of this document] - Installation into a top-level domain or sub-domain (without a directory/path component in the URL) is preferred. Directory paths will @@ -53,10 +53,15 @@ you might have trouble getting everything to work.] 3. Create an empty database and note the access details (hostname, username, password, database name). -4. Visit your website with a web browser and follow the instructions. Please + +4. If you know in advance that it will be impossible for the web server to +write or create files in your web directory, create an empty file called +.htconfig.php and make it writable by the web server. + +5. Visit your website with a web browser and follow the instructions. Please note any error messages and correct these before continuing. -5. *If* the automated installation fails for any reason, check the following: +6. *If* the automated installation fails for any reason, check the following: - ".htconfig.php" exists If not, edit htconfig.php and change system settings. Rename @@ -65,7 +70,7 @@ to .htconfig.php If not, import the contents of "database.sql" with phpmyadmin or mysql command line -6. At this point visit your website again, and register your personal account. +7. At this point visit your website again, and register your personal account. Registration errors should all be recoverable automatically. If you get any *critical* failure at this point, it generally indicates the database was not installed correctly. You might wish to move/rename @@ -78,7 +83,7 @@ tables, so that you can start fresh. **************************************************************************** **************************************************************************** -7. Set up a cron job or scheduled task to run the poller once every 5-10 +8. Set up a cron job or scheduled task to run the poller once every 5-10 minutes to pick up the recent "public" postings of your friends. Example: cd /base/directory; /path/to/php include/poller.php @@ -3,7 +3,7 @@ set_time_limit(0); define ( 'BUILD_ID', 1039 ); -define ( 'FRIENDIKA_VERSION', '2.10.0909' ); +define ( 'FRIENDIKA_VERSION', '2.10.0910' ); define ( 'DFRN_PROTOCOL_VERSION', '2.1' ); define ( 'EOL', "<br />\r\n" ); diff --git a/include/items.php b/include/items.php index f38c0938f..e930ab5d2 100644 --- a/include/items.php +++ b/include/items.php @@ -609,6 +609,7 @@ function item_store($arr,$force_parent = false) { else { // find the parent and snarf the item id and ACL's + // and anything else we need to inherit $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($arr['parent-uri']), @@ -632,6 +633,7 @@ function item_store($arr,$force_parent = false) { $allow_gid = $r[0]['allow_gid']; $deny_cid = $r[0]['deny_cid']; $deny_gid = $r[0]['deny_gid']; + $arr['wall'] = $r[0]['wall']; } else { @@ -19,11 +19,11 @@ $a = new App; /** * * Load the configuration file which contains our DB credentials. - * Ignore errors. If the file doesn't exist, we are running in installation mode. + * Ignore errors. If the file doesn't exist or is empty, we are running in installation mode. * */ -$install = ((file_exists('.htconfig.php')) ? false : true); +$install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false : true); @include(".htconfig.php"); diff --git a/mod/display.php b/mod/display.php index edbadbc75..096ea16c9 100644 --- a/mod/display.php +++ b/mod/display.php @@ -151,7 +151,12 @@ function display_content(&$a) { if(can_write_wall($a,$a->profile['uid'])) { if($item['id'] == $item['parent']) { - $likebuttons = replace_macros($like_tpl,array('$id' => $item['id'])); + $likebuttons = replace_macros($like_tpl,array( + '$id' => $item['id'], + '$likethis' => t("I like this \x28toggle\x29"), + '$nolike' => t("I don't like this \x28toggle\x29"), + '$wait' => t('Please wait') + )); } if($item['last-child']) { $comment = replace_macros($cmnt_tpl,array( diff --git a/mod/network.php b/mod/network.php index 7e7a5ea39..32c7216d4 100644 --- a/mod/network.php +++ b/mod/network.php @@ -360,7 +360,12 @@ function network_content(&$a, $update = 0) { $likebuttons = ''; if($item['id'] == $item['parent']) { - $likebuttons = replace_macros($like_tpl,array('$id' => $item['id'])); + $likebuttons = replace_macros($like_tpl,array( + '$id' => $item['id'], + '$likethis' => t("I like this \x28toggle\x29"), + '$nolike' => t("I don't like this \x28toggle\x29"), + '$wait' => t('Please wait') + )); } if($item['last-child']) { diff --git a/mod/photos.php b/mod/photos.php index c1c6a4133..7d3e57616 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1033,8 +1033,14 @@ function photos_content(&$a) { $likebuttons = ''; - if($can_post || can_write_wall($a,$owner_uid)) - $likebuttons = replace_macros($like_tpl,array('$id' => $link_item['id'])); + if($can_post || can_write_wall($a,$owner_uid)) { + $likebuttons = replace_macros($like_tpl,array( + '$id' => $item['id'], + '$likethis' => t("I like this \x28toggle\x29"), + '$nolike' => t("I don't like this \x28toggle\x29"), + '$wait' => t('Please wait') + )); + } if(! count($r)) { $o .= '<div id="photo-like-div">'; diff --git a/mod/profile.php b/mod/profile.php index 5424a2884..5615573b9 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -302,7 +302,12 @@ function profile_content(&$a, $update = 0) { if(can_write_wall($a,$a->profile['profile_uid'])) { if($item['id'] == $item['parent']) { - $likebuttons = replace_macros($like_tpl,array('$id' => $item['id'])); + $likebuttons = replace_macros($like_tpl,array( + '$id' => $item['id'], + '$likethis' => t("I like this \x28toggle\x29"), + '$nolike' => t("I don't like this \x28toggle\x29"), + '$wait' => t('Please wait') + )); } if($item['last-child']) { $comment = replace_macros($cmnt_tpl,array( diff --git a/util/strings.php b/util/strings.php index 71b1d776b..b010cb9fc 100644 --- a/util/strings.php +++ b/util/strings.php @@ -192,6 +192,8 @@ $a->strings['Cancel'] = 'Cancel'; $a->strings['Global Directory'] = 'Global Directory'; $a->strings['Item not found.'] = 'Item not found.'; $a->strings['Private Message'] = 'Private Message'; +$a->strings["I like this \x28toggle\x29"] = "I like this \x28toggle\x29"; +$a->strings["I don't like this \x28toggle\x29"] = "I don't like this \x28toggle\x29"; $a->strings['This is you'] = 'This is you'; $a->strings['Delete'] = 'Delete'; $a->strings['View $name\'s profile'] = 'View $name\'s profile'; @@ -370,11 +372,12 @@ $a->strings['Your registration is pending approval by the site owner.'] = 'Your $a->strings["You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."; $a->strings['If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'] = 'If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'; $a->strings["Your OpenID \x28optional\x29: "] = "Your OpenID \x28optional\x29: "; +$a->strings['Members of this network prefer to communicate with real people who use their real names.'] = 'Members of this network prefer to communicate with real people who use their real names.'; $a->strings['Include your profile in member directory?'] = 'Include your profile in member directory?'; $a->strings['Registration'] = 'Registration'; $a->strings['Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '] = 'Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '; $a->strings['Your Email Address: '] = 'Your Email Address: '; -$a->strings['Choose a profile nickname. This must begin with a text character. Your global profile locator will then be \'<strong>nickname@$sitename</strong>\'.'] = 'Choose a profile nickname. This must begin with a text character. Your global profile locator will then be \'<strong>nickname@$sitename</strong>\'.'; +$a->strings['Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'<strong>nickname@$sitename</strong>\'.'] = 'Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'<strong>nickname@$sitename</strong>\'.'; $a->strings['Choose a nickname: '] = 'Choose a nickname: '; $a->strings['Please login.'] = 'Please login.'; $a->strings['Registration revoked for '] = 'Registration revoked for '; diff --git a/util/typo.php b/util/typo.php index ac837efe5..ac61ef6d3 100644 --- a/util/typo.php +++ b/util/typo.php @@ -35,4 +35,14 @@ echo $file . "\n"; include_once($file); } - }
\ No newline at end of file + } + + echo "String files\n"; + + echo 'util/strings.php' . "\n"; + include_once('util/strings.php'); + $files = glob('view/*/strings.php'); + foreach($files as $file) { + echo $file . "\n"; + include_once($file); + } diff --git a/view/de/like.tpl b/view/de/like.tpl deleted file mode 100644 index 2f778851a..000000000 --- a/view/de/like.tpl +++ /dev/null @@ -1,5 +0,0 @@ -<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id"> - <img src="images/like.gif" alt="Ich mag das" title="Ich mag das [toggle]" onclick="dolike($id,'like');" /> - <img src="images/dislike.gif" alt="Ich mag das nicht" title="Ich mag das nicht [toggle]" onclick="dolike($id,'dislike');" /> - <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="Bitte warten" title="Bitte warten" style="display: none;" /> - </div> diff --git a/view/de/strings.php b/view/de/strings.php index 002749df9..b45ddee69 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -173,6 +173,8 @@ $a->strings['Submit Request'] = 'Anfrage abschicken'; $a->strings['Cancel'] = 'Abbrechen'; $a->strings['Global Directory'] = 'Weltweites Verzeichnis'; $a->strings['Private Message'] = 'Private Nachricht'; +$a->strings["I like this \x28toggle\x29"] = "Ich mag das \x28toggle\x29"; +$a->strings["I don't like this \x28toggle\x29"] = "Ich mag das nicht \x28toggle\x29"; $a->strings['This is you'] = 'Das bist du'; $a->strings['View $name\'s profile'] = 'Betrachte das Profil von $name'; $a->strings['View $owner_name\'s profile'] = 'Betrachte das Profil von $owner_name'; diff --git a/view/en/like.tpl b/view/en/like.tpl deleted file mode 100644 index 1c385e5de..000000000 --- a/view/en/like.tpl +++ /dev/null @@ -1,5 +0,0 @@ -<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id"> - <img src="images/like.gif" alt="I like this" title="I like this [toggle]" onclick="dolike($id,'like');" /> - <img src="images/dislike.gif" alt="I don't like this" title="I don't like this [toggle]" onclick="dolike($id,'dislike');" /> - <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="Please wait" title="Please wait" style="display: none;" /> - </div> diff --git a/view/fr/like.tpl b/view/fr/like.tpl deleted file mode 100644 index 1c385e5de..000000000 --- a/view/fr/like.tpl +++ /dev/null @@ -1,5 +0,0 @@ -<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id"> - <img src="images/like.gif" alt="I like this" title="I like this [toggle]" onclick="dolike($id,'like');" /> - <img src="images/dislike.gif" alt="I don't like this" title="I don't like this [toggle]" onclick="dolike($id,'dislike');" /> - <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="Please wait" title="Please wait" style="display: none;" /> - </div> diff --git a/view/fr/strings.php b/view/fr/strings.php index b6b20f68c..423645c86 100644 --- a/view/fr/strings.php +++ b/view/fr/strings.php @@ -159,6 +159,8 @@ $a->strings['Cancel'] = 'Annuler'; $a->strings['Global Directory'] = 'Annuaire global'; $a->strings['Item not found.'] = 'Élément introuvable.'; $a->strings['Private Message'] = 'Message privé'; +$a->strings["I like this \x28toggle\x29"] = "I like this \x28toggle\x29"; +$a->strings["I don't like this \x28toggle\x29"] = "I don't like this \x28toggle\x29"; $a->strings['This is you'] = 'C\'est vous'; $a->strings['View $name\'s profile'] = 'Voir le profil de $name'; $a->strings['Item has been removed.'] = 'Cet élément a été enlevé.'; diff --git a/view/it/like.tpl b/view/it/like.tpl deleted file mode 100644 index d64349a4b..000000000 --- a/view/it/like.tpl +++ /dev/null @@ -1,5 +0,0 @@ -<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id"> - <img src="images/like.gif" alt="Mi piace questo" title="Mi piace questo [metti/togli]" onclick="dolike($id,'like');" /> - <img src="images/dislike.gif" alt="Non mi piace questo" title="Non mi piace questo [metti/togli]" onclick="dolike($id,'dislike');" /> - <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="Attendi" title="Attendi" style="display: none;" /> - </div> diff --git a/view/it/strings.php b/view/it/strings.php index 1cee5399a..437d6e7c6 100644 --- a/view/it/strings.php +++ b/view/it/strings.php @@ -138,6 +138,8 @@ $a->strings['Cancel'] = 'Annulla'; $a->strings['Global Directory'] = 'Elenco Globale'; $a->strings['Item not found.'] = 'Elemento non trovato.'; $a->strings['Private Message'] = 'Messaggio privato'; +$a->strings["I like this \x28toggle\x29"] = "Mi piace questo \x28metti/togli\x29"; +$a->strings["I don't like this \x28toggle\x29"] = "Non mi piace questo \x28metti/togli\x29"; $a->strings['This is you'] = 'Questo sei tu'; $a->strings['View $name\'s profile'] = 'Guarda il profilo di $name'; $a->strings['View $owner_name\'s profile'] = 'Guarda il profilo di $owner_name'; diff --git a/view/like.tpl b/view/like.tpl new file mode 100644 index 000000000..e36a624a4 --- /dev/null +++ b/view/like.tpl @@ -0,0 +1,5 @@ +<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id"> + <img src="images/like.gif" alt="$likethis" title="$likethis" onclick="dolike($id,'like');" /> + <img src="images/dislike.gif" alt="$nolike" title="$nolike" onclick="dolike($id,'dislike');" /> + <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> + </div> |