diff options
| -rw-r--r-- | boot.php | 1 | ||||
| -rw-r--r-- | include/config.php | 4 | ||||
| -rw-r--r-- | include/dba.php | 4 | ||||
| -rw-r--r-- | include/plugin.php | 16 | ||||
| -rwxr-xr-x | mod/install.php | 3 | ||||
| -rw-r--r-- | mod/zentity.php | 4 | ||||
| -rw-r--r-- | util/messages.po | 128 | ||||
| -rw-r--r-- | version.inc | 2 |
8 files changed, 118 insertions, 44 deletions
@@ -508,6 +508,7 @@ if(! class_exists('App')) { $this->argc = count($this->argv); if((array_key_exists('0',$this->argv)) && strlen($this->argv[0])) { $this->module = str_replace(".", "_", $this->argv[0]); + $this->module = str_replace("-", "_", $this->module); } else { $this->argc = 1; diff --git a/include/config.php b/include/config.php index 1f2a70e5a..44606e329 100644 --- a/include/config.php +++ b/include/config.php @@ -68,7 +68,7 @@ function get_config($family, $key, $instore = false) { ); if(count($ret)) { // manage array value - $val = (preg_match("|^a:[0-9]+:{.*}$|", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']); + $val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']); $a->config[$family][$key] = $val; return $val; } @@ -162,7 +162,7 @@ function get_pconfig($uid,$family, $key, $instore = false) { ); if(count($ret)) { - $val = (preg_match("|^a:[0-9]+:{.*}$|", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']); + $val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']); $a->config[$uid][$family][$key] = $val; return $val; } diff --git a/include/dba.php b/include/dba.php index 879d7e67e..8d224b570 100644 --- a/include/dba.php +++ b/include/dba.php @@ -78,7 +78,7 @@ class dba { $this->error = ''; - if ($a->config["system"]["db_log"] != "") + if(x($a->config,'system') && x($a->config['system'],'db_log')) $stamp1 = microtime(true); if($this->mysqli) @@ -86,7 +86,7 @@ class dba { else $result = @mysql_query($sql,$this->db); - if ($a->config["system"]["db_log"] != "") { + if(x($a->config,'system') && x($a->config['system'],'db_log')) { $stamp2 = microtime(true); $duration = round($stamp2-$stamp1, 3); if ($duration > $a->config["system"]["db_loglimit"]) { diff --git a/include/plugin.php b/include/plugin.php index 7202ccaa9..c6d62f36e 100644 --- a/include/plugin.php +++ b/include/plugin.php @@ -8,7 +8,10 @@ function uninstall_plugin($plugin){ q("DELETE FROM `addon` WHERE `name` = '%s' ", dbesc($plugin) ); - + + // define THISPLUGIN, make life easy to plugin devs :-) + define("THISPLUGIN", 'addon/' . $plugin . '/' . $plugin . '.php'); + @include_once('addon/' . $plugin . '/' . $plugin . '.php'); if(function_exists($plugin . '_uninstall')) { $func = $plugin . '_uninstall'; @@ -18,9 +21,11 @@ function uninstall_plugin($plugin){ if (! function_exists('install_plugin')){ function install_plugin($plugin) { - // silently fail if plugin was removed + // define THISPLUGIN, make life easy to plugin devs :-) + define("THISPLUGIN", 'addon/' . $plugin . '/' . $plugin . '.php'); + if(! file_exists('addon/' . $plugin . '/' . $plugin . '.php')) return false; logger("Addons: installing " . $plugin); @@ -77,7 +82,10 @@ function reload_plugins() { $pl = trim($pl); $fname = 'addon/' . $pl . '/' . $pl . '.php'; - + + // define THISPLUGIN, make life easy to plugin devs :-) + define("THISPLUGIN", $fname); + if(file_exists($fname)) { $t = @filemtime($fname); foreach($installed as $i) { @@ -163,6 +171,8 @@ function call_hooks($name, &$data = null) { if((is_array($a->hooks)) && (array_key_exists($name,$a->hooks))) { foreach($a->hooks[$name] as $hook) { + // define THISPLUGIN, make life easy to plugin devs :-) + define("THISPLUGIN", $hook[0]); @include_once($hook[0]); if(function_exists($hook[1])) { $func = $hook[1]; diff --git a/mod/install.php b/mod/install.php index eff408964..d2560f8eb 100755 --- a/mod/install.php +++ b/mod/install.php @@ -388,7 +388,7 @@ function check_funcs(&$checks) { $ck_funcs[0]['status']= false; $ck_funcs[0]['help']= t('Error: libCURL PHP module required but not installed.'); } -x if(! function_exists('imagecreatefromjpeg')){ + if(! function_exists('imagecreatefromjpeg')){ $ck_funcs[1]['status']= false; $ck_funcs[1]['help']= t('Error: GD graphics PHP module with JPEG support required but not installed.'); } @@ -466,7 +466,6 @@ function load_database_rem($v, $i){ function load_database($db) { $str = file_get_contents('database.sql'); -// $str = array_reduce(explode("\n", $str),"load_database_rem",""); $arr = explode(';',$str); $errors = false; foreach($arr as $a) { diff --git a/mod/zentity.php b/mod/zentity.php index 41ee7165b..4e3977982 100644 --- a/mod/zentity.php +++ b/mod/zentity.php @@ -104,8 +104,8 @@ function zentity_content(&$a) { '$label_name' => t('Full name'), '$label_nick' => t('Choose a short nickname'), - '$nick_desc' => t('Your nickname will be used to create an easily remembered web address ("webbie") for your profile.'), - '$label_import' => t('Check this box to import an existing identity file from another location'), + '$nick_desc' => t('Your nickname will be used to create an easily remembered web address ("webbie") for your channel.'), + '$label_import' => t('Check this box to import an existing channel file from another location'), '$name' => $name, '$nickname' => $nickname, '$submit' => t('Create') diff --git a/util/messages.po b/util/messages.po index 71884c4c5..3355e449e 100644 --- a/util/messages.po +++ b/util/messages.po @@ -396,8 +396,8 @@ msgstr "" #: ../../mod/profile_photo.php:176 ../../mod/profile_photo.php:254 #: ../../mod/profile_photo.php:263 #: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:304 -#: ../../include/user.php:311 ../../include/user.php:318 +#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:318 +#: ../../include/user.php:325 ../../include/user.php:332 msgid "Profile Photos" msgstr "" @@ -2675,61 +2675,106 @@ msgid "" "potential friends know exactly how to find you." msgstr "" -#: ../../mod/newmember.php:22 +#: ../../mod/newmember.php:32 ../../mod/profperm.php:103 +#: ../../view/theme/diabook/theme.php:128 ../../include/profile_advanced.php:7 +#: ../../include/profile_advanced.php:84 ../../include/nav.php:50 +#: ../../boot.php:1642 +msgid "Profile" +msgstr "" + +#: ../../mod/newmember.php:36 ../../mod/profile_photo.php:211 +msgid "Upload Profile Photo" +msgstr "" + +#: ../../mod/newmember.php:36 msgid "" "Upload a profile photo if you have not done so already. Studies have shown " "that people with real photos of themselves are ten times more likely to make " "friends than people who do not." msgstr "" -#: ../../mod/newmember.php:25 +#: ../../mod/newmember.php:38 +msgid "Edit Your Profile" +msgstr "" + +#: ../../mod/newmember.php:38 +msgid "" +"Edit your <strong>default</strong> profile to your liking. Review the " +"settings for hiding your list of friends and hiding the profile from unknown " +"visitors." +msgstr "" + +#: ../../mod/newmember.php:40 +msgid "Profile Keywords" +msgstr "" + +#: ../../mod/newmember.php:40 +msgid "" +"Set some public keywords for your default profile which describe your " +"interests. We may be able to find other people with similar interests and " +"suggest friendships." +msgstr "" + +#: ../../mod/newmember.php:44 +msgid "Connecting" +msgstr "" + +#: ../../mod/newmember.php:49 ../../mod/newmember.php:51 +#: ../../addon/facebook/facebook.php:728 +#: ../../include/contact_selectors.php:81 +msgid "Facebook" +msgstr "" + +#: ../../mod/newmember.php:49 msgid "" "Authorise the Facebook Connector if you currently have a Facebook account " "and we will (optionally) import all your Facebook friends and conversations." msgstr "" -#: ../../mod/newmember.php:27 +#: ../../mod/newmember.php:51 msgid "" "<em>If</em> this is your own personal server, installing the Facebook addon " "may ease your transition to the free social web." msgstr "" -#: ../../mod/newmember.php:32 +#: ../../mod/newmember.php:56 +msgid "Importing Emails" +msgstr "" + +#: ../../mod/newmember.php:56 msgid "" "Enter your email access information on your Connector Settings page if you " "wish to import and interact with friends or mailing lists from your email " "INBOX" msgstr "" -#: ../../mod/newmember.php:34 -msgid "" -"Edit your <strong>default</strong> profile to your liking. Review the " -"settings for hiding your list of friends and hiding the profile from unknown " -"visitors." -msgstr "" - -#: ../../mod/newmember.php:36 -msgid "" -"Set some public keywords for your default profile which describe your " -"interests. We may be able to find other people with similar interests and " -"suggest friendships." +#: ../../mod/newmember.php:58 +msgid "Go to Your Contacts Page" msgstr "" -#: ../../mod/newmember.php:38 +#: ../../mod/newmember.php:58 msgid "" "Your Contacts page is your gateway to managing friendships and connecting " "with friends on other networks. Typically you enter their address or site " "URL in the <em>Add New Contact</em> dialog." msgstr "" -#: ../../mod/newmember.php:40 +#: ../../mod/newmember.php:60 +msgid "Go to Your Site's Directory" +msgstr "" + +#: ../../mod/newmember.php:60 msgid "" "The Directory page lets you find other people in this network or other " "federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on " "their profile page. Provide your own Identity Address if requested." msgstr "" -#: ../../mod/newmember.php:42 +#: ../../mod/newmember.php:62 +msgid "Finding New People" +msgstr "" + +#: ../../mod/newmember.php:62 msgid "" "On the side panel of the Contacts page are several tools to find new " "friends. We can match people by interest, look up people by name or " @@ -2738,14 +2783,41 @@ msgid "" "hours." msgstr "" -#: ../../mod/newmember.php:44 +#: ../../mod/newmember.php:66 ../../include/group.php:239 +msgid "Groups" +msgstr "" + +#: ../../mod/newmember.php:70 +msgid "Group Your Contacts" +msgstr "" + +#: ../../mod/newmember.php:70 msgid "" "Once you have made some friends, organize them into private conversation " "groups from the sidebar of your Contacts page and then you can interact with " "each group privately on your Network page." msgstr "" -#: ../../mod/newmember.php:46 +#: ../../mod/newmember.php:73 +msgid "Why Aren't My Posts Public?" +msgstr "" + +#: ../../mod/newmember.php:73 +msgid "" +"Friendica respects your privacy. By default, your posts will only show up to " +"people you've added as friends. For more information, see the help section " +"from the link above." +msgstr "" + +#: ../../mod/newmember.php:78 +msgid "Getting Help" +msgstr "" + +#: ../../mod/newmember.php:82 +msgid "Go to the Help Section" +msgstr "" + +#: ../../mod/newmember.php:82 msgid "" "Our <strong>help</strong> pages may be consulted for detail on other program " "features and resources." @@ -4603,11 +4675,6 @@ msgstr "" msgid "Problems with Facebook Real-Time Updates" msgstr "" -#: ../../addon/facebook/facebook.php:728 -#: ../../include/contact_selectors.php:81 -msgid "Facebook" -msgstr "" - #: ../../addon/facebook/facebook.php:729 msgid "Facebook Connector Settings" msgstr "" @@ -6603,6 +6670,7 @@ msgid "Sex Addict" msgstr "" #: ../../include/profile_selectors.php:42 ../../include/user.php:278 +#: ../../include/user.php:283 msgid "Friends" msgstr "" @@ -6901,10 +6969,6 @@ msgstr "" msgid "edit" msgstr "" -#: ../../include/group.php:239 -msgid "Groups" -msgstr "" - #: ../../include/group.php:240 msgid "Edit group" msgstr "" diff --git a/version.inc b/version.inc index e4bb0228c..4902adee3 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2012-08-30.62 +2012-09-01.64 |