importing danish language, updating redirect for login and docs updates

CHANGELOG.rst

@@ -8,7 +8,9 @@ not yet released
 * #62: Replace javascript confirm dialogs with Bootstrap modal dialogs.
 * #66: Unable to add users with MySQL in strict mode.
 * #75: Test mode for email and SMS settings.
-* #83: Invalid redirect after switching languages.
+* #82: Added Danish translation.
+* #83: Invalid redirect after switching languages and logging in.
+* Support for Danish SMS provider Smsit <http://www.smsit.dk/>
 * Composer added for dependencies.
 
 

docs/credits.rst

@@ -42,6 +42,10 @@ The following people have contributed to the development of PHP Server Monitor:
 
   * Website pattern / regular expression search
 
+* nerdalertdk <https://github.com/nerdalertdk>
+
+  * Smsit SMS gateway
+
 
 Translators
 +++++++++++
@@ -56,6 +60,10 @@ The following people have contributed to the translation of PHP Server Monitor:
 
   * Plamen Vasilev <https://github.com/PVasileff>
 
+* Danish
+
+  * nerdalertdk
+
 * French
 
   * David Ribeiro
@@ -81,6 +89,7 @@ The following people have contributed to the translation of PHP Server Monitor:
 
   * Klemens Häckel <http://clickdimension.wordpress.com/>
 
+
 Vendors
 +++++++
 

docs/intro.rst

@@ -53,6 +53,7 @@ The following SMS gateways are currently available:
 * Clickatell - https://www.clickatell.com
 * Mosms - http://www.mosms.com
 * Textmarketer - http://www.textmarketer.co.uk
+* SMSit - http://smsit.dk
 
 Please note: for these gateways you will need an account with sufficient credits.
 

src/includes/functions.inc.php

@@ -414,7 +414,7 @@ function psm_build_mail($from_name = null, $from_email = null) {
 
 /**
  * Prepare a new SMS util.
- * 
+ *
  * @return \psm\Txtmsg\TxtmsgInterface
  */
 function psm_build_sms() {
@@ -426,6 +426,9 @@ function psm_build_sms() {
 		case 'mosms':
 			$sms = new \psm\Txtmsg\Mosms();
 			break;
+		case 'smsit':
+			$sms = new \psm\Txtmsg\Smsit();
+			break;
 		case 'inetworx':
 			$sms = new \psm\Txtmsg\Inetworx();
 			break;
@@ -443,7 +446,7 @@ function psm_build_sms() {
 			$sms = new \psm\Txtmsg\Textmarketer();
 			break;
 	}
-	
+
 	// copy login information from the config file
 	if($sms) {
 		$sms->setLogin(psm_get_conf('sms_gateway_username'), psm_get_conf('sms_gateway_password'));
@@ -455,7 +458,7 @@ function psm_build_sms() {
 
 /**
  * Generate a new link to the current monitor
- * @param array $params key value pairs
+ * @param array|string $params key value pairs or pre-formatted string
  * @param boolean $urlencode urlencode all params?
  * @param boolean $htmlentities use entities in url?
  * @return string
@@ -470,13 +473,17 @@ function psm_build_url($params = array(), $urlencode = true, $htmlentities = tru
 
 	if($params != null) {
 		$url .= '?';
-		$delim = ($htmlentities) ? '&' : '&';
+		if(is_array($params)) {
+			$delim = ($htmlentities) ? '&' : '&';
 
-		foreach($params as $k => $v) {
+			foreach($params as $k => $v) {
-			if($urlencode) {
+				if($urlencode) {
-				$v = urlencode($v);
+					$v = urlencode($v);
+				}
+				$url .= $delim . $k . '=' . $v;
 			}
-			$url .= $delim . $k . '=' . $v;
+		} else {
+			$url .= $params;
 		}
 	}
 

src/lang/bg_BG.lang.php

@@ -39,7 +39,6 @@ $sm_lang = array(
 		'message' => 'Съобщение',
 		'yes' => 'Да',
 		'no' => 'Не',
-		'edit' => 'Редактирай',
 		'insert' => 'Добавяне',
 		'add_new' => 'Добави нов',
 		'update_available' => 'Налична е нова версия: ({version}). Може да я свалите от <a href="http://www.phpservermonitor.org" target="_blank">тук</a>.',

src/lang/da_DK.lang.php

@@ -18,7 +18,7 @@
  * along with PHP Server Monitor.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @package     phpservermon
- * @author      Pepijn Over <pep@neanderthal-technology.com>
+ * @author      nerdalertdk
  * @copyright   Copyright (c) 2008-2014 Pepijn Over <pep@neanderthal-technology.com>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
  * @version     Release: @package_version@
@@ -26,7 +26,7 @@
  **/
 
 $sm_lang = array(
-	'name' => 'Danish',
+	'name' => 'Dansk - Danish',
 	'locale' => array('da_DK.UTF-8', 'da_DK', 'danish', 'danish-dk'),
 	'system' => array(
 		'title' => 'Server Monitor',
@@ -170,8 +170,8 @@ $sm_lang = array(
 		'sms_gateway_spryng' => 'Spryng',
 		'sms_gateway_inetworx' => 'Inetworx',
 		'sms_gateway_clickatell' => 'Clickatell',
-		'sms_gateway_smsit' => 'Smsit',
         'sms_gateway_textmarketer' => 'Textmarketer',
+		'sms_gateway_smsit' => 'Smsit',
 		'sms_gateway_username' => 'Gateway brugernavn/apikey',
 		'sms_gateway_password' => 'Gateway adgangskode',
 		'sms_from' => 'Afsenders navn.',
@@ -193,6 +193,7 @@ $sm_lang = array(
 		'log_email' => 'Log mails sendt af systemet',
 		'log_sms' => 'Log SMS sendt af systemet',
 		'updated' => 'Indstillingerne er blevet opdateret.',
+		'nochanges' => 'The configuration didn\'t change.',
 		'tab_email' => 'Email',
 		'tab_sms' => 'SMS',
 		'tab_log' => 'Log',
@@ -207,6 +208,15 @@ $sm_lang = array(
 			'Tid i sekunder, Hvis 0 vil siden ikke genopfriske automatisk'.
 			'</span>',
 		'seconds' => 'sekunder',
+		'test' => 'Test',
+		'test_email' => 'An email will be sent to the address specified in your user profile.',
+		'test_sms' => 'An SMS will be sent to the phone number specified in your user profile.',
+		'send' => 'Send',
+		'test_message' => 'Test message',
+		'email_sent' => 'Email sent',
+		'email_error' => 'Error in email sending',
+		'sms_sent' => 'Sms sent',
+		'sms_error' => 'Error in sms sending',
 	),
 	// for newlines in the email messages use <br/>
 	'notifications' => array(

src/lang/de_DE.lang.php

@@ -39,7 +39,6 @@ $sm_lang = array(
 		'message' => 'Meldung',
 		'yes' => 'Ja',
 		'no' => 'Nein',
-		'edit' => 'Bearbeiten',
 		'insert' => 'Einfügen',
 		'add_new' => 'Neuen Eintrag erstellen',
 		'update_available' => 'Ein neues Update ({version}) ist verf&uuml;gbar auf <a href="http://www.phpservermonitor.org" target="_blank">http://www.phpservermonitor.org</a>.',

src/lang/en_US.lang.php

@@ -39,7 +39,6 @@ $sm_lang = array(
 		'message' => 'Message',
 		'yes' => 'Yes',
 		'no' => 'No',
-		'edit' => 'Edit',
 		'insert' => 'Insert',
 		'add_new' => 'Add new',
 		'update_available' => 'A new version ({version}) is available from <a href="http://www.phpservermonitor.org" target="_blank">http://www.phpservermonitor.org</a>.',

src/lang/es_ES.lang.php

@@ -39,7 +39,6 @@ $sm_lang = array(
 		'message' => 'Mensaje',
 		'yes' => 'Si',
 		'no' => 'No',
-		'edit' => 'Modificar',
 		'insert' => 'Insertar',
 		'add_new' => 'Agregar nuevo',
 		'update_available' => 'Hay una nueva versión ({version}) disponible en <a href="http://www.phpservermonitor.org" target="_blank">http://www.phpservermonitor.org</a>.',

src/lang/fr_FR.lang.php

@@ -39,7 +39,6 @@ $sm_lang = array(
 		'message' => 'Message',
 		'yes' => 'Oui',
 		'no' => 'Non',
-		'edit' => 'Editer',
 		'insert' => 'Nouveau',
 		'add_new' => 'Nouveau',
 		'update_available' => 'Une nouvelle version ({version}) est disponible à l\'adresse <a href="http://www.phpservermonitor.org" target="_blank">http://www.phpservermonitor.org</a>.',

src/lang/it_IT.lang.php

@@ -39,7 +39,6 @@ $sm_lang = array(
 		'message' => 'Messaggio',
 		'yes' => 'Sì',
 		'no' => 'No',
-		'edit' => 'Modifica',
 		'insert' => 'Inserisci',
 		'add_new' => 'Aggiungi Nuovo?',
 		'update_available' => 'Un nuovo aggiornamento ({version}) è disponibile su <a href="http://www.phpservermonitor.org" target="_blank">http://www.phpservermonitor.org</a>.',

src/lang/ko_KR.lang.php

@@ -39,7 +39,6 @@ $sm_lang = array(
 		'message' => '메세지',
 		'yes' => '예',
 		'no' => '아니오',
-		'edit' => '수정',
 		'insert' => '삽입',
 		'add_new' => '새계정 추가',
 		'update_available' => '새로운 업데이트가 있습니다 ({version}). 다음사이트를 방문 해 주십시오. <a href="http://www.phpservermonitor.org" target="_blank">http://www.phpservermonitor.org</a>.',

src/lang/nl_NL.lang.php

@@ -39,7 +39,6 @@ $sm_lang = array(
 		'message' => 'Bericht',
 		'yes' => 'Ja',
 		'no' => 'Nee',
-		'edit' => 'Wijzig',
 		'insert' => 'Voeg toe',
 		'add_new' => 'Voeg toe',
 		'update_available' => 'Een nieuwe update ({version}) is beschikbaar op <a href="http://www.phpservermonitor.org" target="_blank">http://www.phpservermonitor.org</a>.',

src/lang/pt_BR.lang.php

@@ -39,7 +39,6 @@ $sm_lang = array(
         'message' => 'Mensagem',
         'yes' => 'Sim',
         'no' => 'Não',
-        'edit' => 'Editar',
         'insert' => 'Inserir',
         'add_new' => 'Adicionar novo',
         'update_available' => 'Uma atualização ({version}) disponível em <a href="http://www.phpservermonitor.org" target="_blank">http://www.phpservermonitor.org</a>.',

src/lang/zh_CN.lang.php

@@ -39,7 +39,6 @@ $sm_lang = array(
 		'message' => '消息',
 		'yes' => '是',
 		'no' => '否o',
-		'edit' => '编辑',
 		'insert' => '插入',
 		'add_new' => '添加',
 		'update_available' => '发现新版本({version}) <a href="http://www.phpservermonitor.org" target="_blank">http://www.phpservermonitor.org</a>.',

src/psm/Module/User/Controller/LoginController.class.php

@@ -58,7 +58,7 @@ class LoginController extends AbstractController {
 
 			if($result) {
 				// success login, redirect
-				header('Location: //'.$_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI']);
+				header('Location: ' . psm_build_url($_SERVER['QUERY_STRING']));
 				die();
 			} else {
 				$this->addMessage(psm_get_lang('login', 'error_login_incorrect'), 'error');

src/psm/Txtmsg/Smsit.class.php

@@ -18,12 +18,12 @@
  * along with PHP Server Monitor.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @package     phpservermon
- * @author      Perri Vardy-Mason
+ * @author      nerdalertdk
  * @copyright   Copyright (c) 2008-2014 Pepijn Over <pep@neanderthal-technology.com>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
  * @version     Release: @package_version@
  * @link        http://www.phpservermonitor.org/
- * @since       phpservermon 2.1
+ * @since       phpservermon 3.1
  **/
 
 namespace psm\Txtmsg;