From 8e194cb4112a6e80f194b6b37cbe79c831413b4e Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 20 Dec 2012 12:13:37 +0100 Subject: [PATCH 1/9] Vier: switching some more icons to "font awesome" --- view/theme/vier/comment_item.tpl | 17 +++++++++-------- view/theme/vier/style.css | 8 ++++++-- view/theme/vier/wall_thread.tpl | 2 +- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/view/theme/vier/comment_item.tpl b/view/theme/vier/comment_item.tpl index ac7073d71..fd27e494b 100644 --- a/view/theme/vier/comment_item.tpl +++ b/view/theme/vier/comment_item.tpl @@ -29,15 +29,16 @@
- {{ if $item.plink }}{{ endif }} + + {{ if $item.conv }}{{ endif }}
From 99ca867869bfe8a85fdb89446afb5b9f83983a5d Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Fri, 21 Dec 2012 18:23:55 +0100 Subject: [PATCH 8/9] The performance settings and other systems settings (lock file path, temp path) can now be set via the front end. --- include/items.php | 2 ++ mod/admin.php | 41 ++++++++++++++++++++++++++++++++--------- view/admin_site.tpl | 8 ++++++++ 3 files changed, 42 insertions(+), 9 deletions(-) diff --git a/include/items.php b/include/items.php index cd25b5665..fa46fe108 100755 --- a/include/items.php +++ b/include/items.php @@ -823,6 +823,8 @@ function get_atom_elements($feed,$item) { $res["author-name"] = $name; $res["author-link"] = $uri; $res["author-avatar"] = $avatar; + + $res["body"] = html2bbcode($message); } } } diff --git a/mod/admin.php b/mod/admin.php index bd0d14bef..aeff87f82 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -241,14 +241,14 @@ function admin_page_site_post(&$a){ $maximagesize = ((x($_POST,'maximagesize')) ? intval(trim($_POST['maximagesize'])) : 0); $maximagelength = ((x($_POST,'maximagelength')) ? intval(trim($_POST['maximagelength'])) : MAX_IMAGE_LENGTH); $jpegimagequality = ((x($_POST,'jpegimagequality')) ? intval(trim($_POST['jpegimagequality'])) : JPEG_QUALITY); - - + + $register_policy = ((x($_POST,'register_policy')) ? intval(trim($_POST['register_policy'])) : 0); - $daily_registrations = ((x($_POST,'max_daily_registrations')) ? intval(trim($_POST['max_daily_registrations'])) :0); + $daily_registrations = ((x($_POST,'max_daily_registrations')) ? intval(trim($_POST['max_daily_registrations'])) :0); $abandon_days = ((x($_POST,'abandon_days')) ? intval(trim($_POST['abandon_days'])) : 0); - $register_text = ((x($_POST,'register_text')) ? notags(trim($_POST['register_text'])) : ''); - + $register_text = ((x($_POST,'register_text')) ? notags(trim($_POST['register_text'])) : ''); + $allowed_sites = ((x($_POST,'allowed_sites')) ? notags(trim($_POST['allowed_sites'])) : ''); $allowed_email = ((x($_POST,'allowed_email')) ? notags(trim($_POST['allowed_email'])) : ''); $block_public = ((x($_POST,'block_public')) ? True : False); @@ -273,6 +273,12 @@ function admin_page_site_post(&$a){ $ostatus_disabled = !((x($_POST,'ostatus_disabled')) ? True : False); $diaspora_enabled = ((x($_POST,'diaspora_enabled')) ? True : False); $ssl_policy = ((x($_POST,'ssl_policy')) ? intval($_POST['ssl_policy']) : 0); + $new_share = ((x($_POST,'new_share')) ? True : False); + $use_fulltext_engine = ((x($_POST,'use_fulltext_engine')) ? True : False); + $itemcache = ((x($_POST,'itemcache')) ? notags(trim($_POST['itemcache'])) : ''); + $itemcache_duration = ((x($_POST,'itemcache_duration')) ? intval($_POST['itemcache_duration']) : 0); + $lockpath = ((x($_POST,'lockpath')) ? notags(trim($_POST['lockpath'])) : ''); + $temppath = ((x($_POST,'temppath')) ? notags(trim($_POST['temppath'])) : ''); if($ssl_policy != intval(get_config('system','ssl_policy'))) { if($ssl_policy == SSL_POLICY_FULL) { @@ -372,10 +378,18 @@ function admin_page_site_post(&$a){ set_config('system','ostatus_disabled', $ostatus_disabled); set_config('system','diaspora_enabled', $diaspora_enabled); + set_config('system','new_share', $new_share); + set_config('system','use_fulltext_engine', $use_fulltext_engine); + set_config('system','itemcache', $itemcache); + set_config('system','itemcache_duration', $itemcache_duration); + set_config('system','lockpath', $lockpath); + set_config('system','temppath', $temppath); + + info( t('Site settings updated.') . EOL); goaway($a->get_baseurl(true) . '/admin/site' ); - return; // NOTREACHED - + return; // NOTREACHED + } /** @@ -447,6 +461,7 @@ function admin_page_site(&$a) { '$upload' => t('File upload'), '$corporate' => t('Policies'), '$advanced' => t('Advanced'), + '$performance' => t('Performance'), '$baseurl' => $a->get_baseurl(true), // name, label, value, help string, extra data... @@ -456,6 +471,7 @@ function admin_page_site(&$a) { '$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - change theme settings"), $theme_choices), '$theme_mobile' => array('theme_mobile', t("Mobile system theme"), get_config('system','mobile-theme'), t("Theme for mobile devices"), $theme_choices_mobile), '$ssl_policy' => array('ssl_policy', t("SSL link policy"), (string) intval(get_config('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices), + '$new_share' => array('new_share', t("'Share' element"), get_config('system','new_share'), t("Activates the bbcode element 'share' for repeating items.")), '$maximagesize' => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")), '$maximagelength' => array('maximagelength', t("Maximum image length"), get_config('system','max_image_length'), t("Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits.")), '$jpegimagequality' => array('jpegimagequality', t("JPEG image quality"), get_config('system','jpeg_quality'), t("Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality.")), @@ -471,7 +487,7 @@ function admin_page_site(&$a) { '$global_directory' => array('directory_submit_url', t("Global directory update URL"), get_config('system','directory_submit_url'), t("URL to update the global directory. If this is not set, the global directory is completely unavailable to the application.")), '$thread_allow' => array('thread_allow', t("Allow threaded items"), get_config('system','thread_allow'), t("Allow infinite level threading for items on this site.")), '$newuser_private' => array('newuser_private', t("Private posts by default for new users"), get_config('system','newuser_private'), t("Set default post permissions for all new members to the default privacy group rather than public.")), - + '$no_multi_reg' => array('no_multi_reg', t("Block multiple registrations"), get_config('system','block_extended_register'), t("Disallow users to register additional accounts for use as pages.")), '$no_openid' => array('no_openid', t("OpenID support"), !get_config('system','no_openid'), t("OpenID support for registration and logins.")), '$no_regfullname' => array('no_regfullname', t("Fullname check"), !get_config('system','no_regfullname'), t("Force users to register with a space between firstname and lastname in Full name, as an antispam measure")), @@ -487,8 +503,15 @@ function admin_page_site(&$a) { '$delivery_interval' => array('delivery_interval', t("Delivery interval"), (x(get_config('system','delivery_interval'))?get_config('system','delivery_interval'):2), t("Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers.")), '$poll_interval' => array('poll_interval', t("Poll interval"), (x(get_config('system','poll_interval'))?get_config('system','poll_interval'):2), t("Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval.")), '$maxloadavg' => array('maxloadavg', t("Maximum Load Average"), ((intval(get_config('system','maxloadavg')) > 0)?get_config('system','maxloadavg'):50), t("Maximum system load before delivery and poll processes are deferred - default 50.")), + + '$use_fulltext_engine' => array('use_fulltext_engine', t("Use MySQL full text engine"), get_config('system','use_fulltext_engine'), t("Activates the full text engine. Speeds up search - but can only search for four and more characters.")), + '$itemcache' => array('itemcache', t("Path to item cache"), get_config('system','itemcache'), "The item caches buffers generated bbcode and external images."), + '$itemcache_duration' => array('itemcache_duration', t("Cache duration in seconds"), get_config('system','itemcache_duration'), t("How long should the cache files be hold? Default value is 86400 seconds (One day).")), + '$lockpath' => array('lockpath', t("Path for lock file"), get_config('system','lockpath'), "The lock file is used to avoid multiple pollers at one time. Only define a folder here."), + '$temppath' => array('temppath', t("Temp path"), get_config('system','temppath'), "If you have a restricted system where the webserver can't access the system temp path, enter another path here."), + '$form_security_token' => get_form_security_token("admin_site"), - + )); } diff --git a/view/admin_site.tpl b/view/admin_site.tpl index 11122cb47..ae550057d 100644 --- a/view/admin_site.tpl +++ b/view/admin_site.tpl @@ -47,6 +47,7 @@ {{ inc field_select.tpl with $field=$theme }}{{ endinc }} {{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }} {{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }} + {{ inc field_checkbox.tpl with $field=$new_share }}{{ endinc }}
@@ -90,6 +91,13 @@ {{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }} {{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }} {{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }} + {{ inc field_input.tpl with $field=$lockpath }}{{ endinc }} + {{ inc field_input.tpl with $field=$temppath }}{{ endinc }} + +

$performance

+ {{ inc field_checkbox.tpl with $field=$use_fulltext_engine }}{{ endinc }} + {{ inc field_input.tpl with $field=$itemcache }}{{ endinc }} + {{ inc field_input.tpl with $field=$itemcache_duration }}{{ endinc }}
From b0759e9a9f579b573b14b10338ab0fa58126824a Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 22 Dec 2012 16:16:01 +0100 Subject: [PATCH 9/9] Some more system settings are now reachable via front-end Bugfixing in the mail import when a reply header isn't set correctly --- include/onepoll.php | 5 +++-- mod/admin.php | 3 +++ view/admin_site.tpl | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/onepoll.php b/include/onepoll.php index c493aff76..d819b7f42 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -398,14 +398,15 @@ function onepoll_run(&$argv, &$argc){ // Is it a reply? $reply = ((substr(strtolower($datarray['title']), 0, 3) == "re:") or (substr(strtolower($datarray['title']), 0, 3) == "re-") or - (raw_refs != "")); + ($raw_refs != "")); // Remove Reply-signs in the subject $datarray['title'] = RemoveReply($datarray['title']); // If it seems to be a reply but a header couldn't be found take the last message with matching subject if(!x($datarray,'parent-uri') and $reply) { - $r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE MATCH (`title`) AGAINST ('".'"%s"'."' IN BOOLEAN MODE) AND `uid` = %d ORDER BY `created` DESC LIMIT 1", + //$r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE MATCH (`title`) AGAINST ('".'"%s"'."' IN BOOLEAN MODE) AND `uid` = %d ORDER BY `created` DESC LIMIT 1", + $r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE `title` = \"%s\" AND `uid` = %d ORDER BY `created` DESC LIMIT 1", dbesc(protect_sprintf($datarray['title'])), intval($importer_uid)); if(count($r)) diff --git a/mod/admin.php b/mod/admin.php index aeff87f82..41147fa01 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -279,6 +279,7 @@ function admin_page_site_post(&$a){ $itemcache_duration = ((x($_POST,'itemcache_duration')) ? intval($_POST['itemcache_duration']) : 0); $lockpath = ((x($_POST,'lockpath')) ? notags(trim($_POST['lockpath'])) : ''); $temppath = ((x($_POST,'temppath')) ? notags(trim($_POST['temppath'])) : ''); + $basepath = ((x($_POST,'basepath')) ? notags(trim($_POST['basepath'])) : ''); if($ssl_policy != intval(get_config('system','ssl_policy'))) { if($ssl_policy == SSL_POLICY_FULL) { @@ -384,6 +385,7 @@ function admin_page_site_post(&$a){ set_config('system','itemcache_duration', $itemcache_duration); set_config('system','lockpath', $lockpath); set_config('system','temppath', $temppath); + set_config('system','basepath', $basepath); info( t('Site settings updated.') . EOL); @@ -509,6 +511,7 @@ function admin_page_site(&$a) { '$itemcache_duration' => array('itemcache_duration', t("Cache duration in seconds"), get_config('system','itemcache_duration'), t("How long should the cache files be hold? Default value is 86400 seconds (One day).")), '$lockpath' => array('lockpath', t("Path for lock file"), get_config('system','lockpath'), "The lock file is used to avoid multiple pollers at one time. Only define a folder here."), '$temppath' => array('temppath', t("Temp path"), get_config('system','temppath'), "If you have a restricted system where the webserver can't access the system temp path, enter another path here."), + '$basepath' => array('basepath', t("Base path to installation"), get_config('system','basepath'), "If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot."), '$form_security_token' => get_form_security_token("admin_site"), diff --git a/view/admin_site.tpl b/view/admin_site.tpl index ae550057d..7e442cdfb 100644 --- a/view/admin_site.tpl +++ b/view/admin_site.tpl @@ -93,6 +93,7 @@ {{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }} {{ inc field_input.tpl with $field=$lockpath }}{{ endinc }} {{ inc field_input.tpl with $field=$temppath }}{{ endinc }} + {{ inc field_input.tpl with $field=$basepath }}{{ endinc }}

$performance

{{ inc field_checkbox.tpl with $field=$use_fulltext_engine }}{{ endinc }}