Merge pull request #4 from dignajar/master

New merge
bludit · Oct 6, 2015 · d6590b3 · d6590b3
2 parents 247e2d2 + a1bfc15
commit d6590b3
Show file tree

Hide file tree

Showing 50 changed files with 972 additions and 456 deletions.
diff --git a/admin/controllers/edit-user.php b/admin/controllers/edit-user.php
@@ -48,6 +48,11 @@ function deleteUser($args, $deleteContent=false)
 		return false;
 	}
 
+	// The editors cannot delete users.
+	if($Login->role()!=='admin') {
+		return false;
+	}
+
 	if($deleteContent) {
 		$dbPosts->deletePostsByUser($args['username']);
 	}

diff --git a/admin/views/edit-user.php b/admin/views/edit-user.php
@@ -6,7 +6,7 @@
         <li><a href="#email"><?php $Language->p('Email') ?></a></li>
         <li><a href="#password"><?php $Language->p('Password') ?></a></li>
 
-        <?php if($_user['username']!=='admin') { ?>
+        <?php if($_user['username']=='admin') { ?>
         <li><a href="#delete"><?php $Language->p('Delete') ?></a></li>
         <?php } ?>
     </ul>
@@ -18,9 +18,7 @@
 
 <div id="profile">
 <form method="post" action="" class="forms">
-
     <input type="hidden" id="jstoken" name="token" value="<?php $Security->printToken() ?>">
-    <input type="hidden" name="edit-user" value="true">
     <input type="hidden" name="username" value="<?php echo $_user['username'] ?>">
 
     <label>
@@ -50,7 +48,7 @@
 
 <?php } ?>
 
-    <input type="submit" class="btn btn-blue" value="<?php $Language->p('Save') ?>" name="user-profile">
+    <input type="submit" class="btn btn-blue" value="<?php $Language->p('Save') ?>" name="edit-user">
     <a href="<?php echo HTML_PATH_ADMIN_ROOT.'users' ?>" class="btn"><?php $Language->p('Cancel') ?></a>
 </form>
 </div>
@@ -61,7 +59,7 @@
 
 <div id="email">
 <form method="post" action="" class="forms">
-    <input type="hidden" name="edit-user" value="true">
+    <input type="hidden" id="jstoken" name="token" value="<?php $Security->printToken() ?>">
     <input type="hidden" name="username" value="<?php echo $_user['username'] ?>">
 
     <label>
@@ -70,7 +68,7 @@
         <div class="forms-desc"><?php $Language->p('email-will-not-be-publicly-displayed') ?></div>
     </label>
 
-    <input type="submit" class="btn btn-blue" value="<?php $Language->p('Save') ?>" name="user-email">
+    <input type="submit" class="btn btn-blue" value="<?php $Language->p('Save') ?>" name="edit-user">
     <a href="<?php echo HTML_PATH_ADMIN_ROOT.'users' ?>" class="btn"><?php $Language->p('Cancel') ?></a>
 </form>
 </div>
@@ -81,7 +79,7 @@
 
 <div id="password">
 <form method="post" action="" class="forms">
-    <input type="hidden" name="change-password" value="true">
+    <input type="hidden" id="jstoken" name="token" value="<?php $Security->printToken() ?>">
     <input type="hidden" name="username" value="<?php echo $_user['username'] ?>">
 
     <label>
@@ -94,28 +92,28 @@
         <input type="password" name="confirm-password" class="width-50">
     </label>
 
-    <input type="submit" class="btn btn-blue" value="<?php $Language->p('Save') ?>" name="user-password">
+    <input type="submit" class="btn btn-blue" value="<?php $Language->p('Save') ?>" name="change-password">
     <a href="<?php echo HTML_PATH_ADMIN_ROOT.'users' ?>" class="btn"><?php $Language->p('Cancel') ?></a>
 </form>
 </div>
 
 <!-- ===================================== -->
 <!-- Delete -->
 <!-- ===================================== -->
-<?php if($_user['username']!=='admin') { ?>
+<?php if($_user['username']=='admin') { ?>
 
 <div id="delete">
 
     <form method="post" action="" class="forms">
-        <input type="hidden" name="delete-user-all" value="true">
+        <input type="hidden" id="jstoken" name="token" value="<?php $Security->printToken() ?>">
         <input type="hidden" name="username" value="<?php echo $_user['username'] ?>">
-        <p><input type="submit" class="btn btn-blue" value="<?php $Language->p('Delete the user and all its posts') ?>"></p>
+        <p><input type="submit" name="delete-user-all" class="btn btn-blue" value="<?php $Language->p('Delete the user and all its posts') ?>"></p>
     </form>
 
     <form method="post" action="" class="forms">
-        <input type="hidden" name="delete-user-associate" value="true">
+        <input type="hidden" id="jstoken" name="token" value="<?php $Security->printToken() ?>">
         <input type="hidden" name="username" value="<?php echo $_user['username'] ?>">
-        <p><input type="submit" class="btn btn-blue" value="<?php $Language->p('Delete the user and associate its posts to admin user') ?>"></p>
+        <p><input type="submit" name="delete-user-associate" class="btn btn-blue" value="<?php $Language->p('Delete the user and associate its posts to admin user') ?>"></p>
     </form>
 
     <a href="<?php echo HTML_PATH_ADMIN_ROOT.'users' ?>" class="btn"><?php $Language->p('Cancel') ?></a>

diff --git a/admin/views/settings.php b/admin/views/settings.php
@@ -87,6 +87,21 @@
     <div class="forms-desc"><?php $Language->p('the-url-of-your-site') ?></div>
     </label>
 
+    <h4><?php $Language->p('Command Line Mode') ?></h4>
+
+    <label for="cliMode">
+        <?php $Language->p('Cli Mode') ?>
+        <select name="cliMode" class="width-50">
+        <?php
+            $htmlOptions = array('true'=>'Enabled', 'false'=>'Disabled');
+            foreach($htmlOptions as $value=>$text) {
+                echo '<option value="'.$value.'"'.( ($Site->cliMode()===$value)?' selected="selected"':'').'>'.$text.'</option>';
+            }
+        ?>
+        </select>
+        <div class="forms-desc"><?php $Language->p('enable-the-command-line-mode-if-you-add-edit') ?></div>
+    </label>
+
     <h4><?php $Language->p('URL Filters') ?></h4>
 
     <label>

diff --git a/kernel/boot/init.php b/kernel/boot/init.php
@@ -162,6 +162,10 @@
 // PHP paths with dependency
 define('PATH_THEME',			PATH_ROOT.'themes/'.$Site->theme().'/');
 define('PATH_THEME_PHP',		PATH_THEME.'php'.DS);
+define('PATH_THEME_CSS',		PATH_THEME.'css'.DS);
+define('PATH_THEME_JS',			PATH_THEME.'js'.DS);
+define('PATH_THEME_IMG',		PATH_THEME.'img'.DS);
+define('PATH_THEME_LANG',		PATH_THEME.'languages'.DS);
 
 // Objects with dependency
 $Language 	= new dbLanguage( $Site->locale() );

diff --git a/kernel/dbpages.class.php b/kernel/dbpages.class.php
@@ -333,10 +333,6 @@ public function regenerateCli()
 			}
 		}
 
-		$fields['status'] = CLI_STATUS;
-		$fields['date'] = Date::current(DB_DATE_FORMAT);
-		$fields['username'] = 'admin';
-
 		//$tmpPaths = glob(PATH_PAGES.'*', GLOB_ONLYDIR);
 		$tmpPaths = Filesystem::listDirectories(PATH_PAGES);
 		foreach($tmpPaths as $directory)
@@ -364,7 +360,14 @@ public function regenerateCli()
 
 		foreach($newPaths as $key=>$value)
 		{
-			if(!isset($this->db[$key])) {
+			if(!isset($this->db[$key]))
+			{
+				// Default values for the new pages.
+				$fields['status'] = CLI_STATUS;
+				$fields['date'] = Date::current(DB_DATE_FORMAT);
+				$fields['username'] = 'admin';
+
+				// Create the entry for the new page.
 				$this->db[$key] = $fields;
 			}
 

diff --git a/kernel/helpers/text.class.php b/kernel/helpers/text.class.php
@@ -2,6 +2,65 @@
 
 class Text {
 
+	private static $specialChars = array(
+		// Latin
+		'À'=>'A', 'Á'=>'A', 'Â'=>'A', 'Ã'=>'A', 'Ä'=>'A', 'Å'=>'A', 'Æ'=>'AE', 'Ç'=>'C',
+		'È'=>'E', 'É'=>'E', 'Ê'=>'E', 'Ë'=>'E', 'Ì'=>'I', 'Í'=>'I', 'Î'=>'I', 'Ï'=>'I',
+		'Ð'=>'D', 'Ñ'=>'N', 'Ò'=>'O', 'Ó'=>'O', 'Ô'=>'O', 'Õ'=>'O', 'Ö'=>'O', 'Ő'=>'O',
+		'Ø'=>'O', 'Ù'=>'U', 'Ú'=>'U', 'Û'=>'U', 'Ü'=>'U', 'Ű'=>'U', 'Ý'=>'Y', 'Þ'=>'TH',
+		'ß'=>'ss',
+		'à'=>'a', 'á'=>'a', 'â'=>'a', 'ã'=>'a', 'ä'=>'a', 'å'=>'a', 'æ'=>'ae', 'ç'=>'c',
+		'è'=>'e', 'é'=>'e', 'ê'=>'e', 'ë'=>'e', 'ì'=>'i', 'í'=>'i', 'î'=>'i', 'ï'=>'i',
+		'ð'=>'d', 'ñ'=>'n', 'ò'=>'o', 'ó'=>'o', 'ô'=>'o', 'õ'=>'o', 'ö'=>'o', 'ő'=>'o',
+		'ø'=>'o', 'ù'=>'u', 'ú'=>'u', 'û'=>'u', 'ü'=>'u', 'ű'=>'u', 'ý'=>'y', 'þ'=>'th',
+		'ÿ'=>'y',
+		// Latin symbols
+		'©'=>'(c)',
+		// Greek
+		'Α'=>'A', 'Β'=>'B', 'Γ'=>'G', 'Δ'=>'D', 'Ε'=>'E', 'Ζ'=>'Z', 'Η'=>'H', 'Θ'=>'8',
+		'Ι'=>'I', 'Κ'=>'K', 'Λ'=>'L', 'Μ'=>'M', 'Ν'=>'N', 'Ξ'=>'3', 'Ο'=>'O', 'Π'=>'P',
+		'Ρ'=>'R', 'Σ'=>'S', 'Τ'=>'T', 'Υ'=>'Y', 'Φ'=>'F', 'Χ'=>'X', 'Ψ'=>'PS', 'Ω'=>'W',
+		'Ά'=>'A', 'Έ'=>'E', 'Ί'=>'I', 'Ό'=>'O', 'Ύ'=>'Y', 'Ή'=>'H', 'Ώ'=>'W', 'Ϊ'=>'I',
+		'Ϋ'=>'Y',
+		'α'=>'a', 'β'=>'b', 'γ'=>'g', 'δ'=>'d', 'ε'=>'e', 'ζ'=>'z', 'η'=>'h', 'θ'=>'8',
+		'ι'=>'i', 'κ'=>'k', 'λ'=>'l', 'μ'=>'m', 'ν'=>'n', 'ξ'=>'3', 'ο'=>'o', 'π'=>'p',
+		'ρ'=>'r', 'σ'=>'s', 'τ'=>'t', 'υ'=>'y', 'φ'=>'f', 'χ'=>'x', 'ψ'=>'ps', 'ω'=>'w',
+		'ά'=>'a', 'έ'=>'e', 'ί'=>'i', 'ό'=>'o', 'ύ'=>'y', 'ή'=>'h', 'ώ'=>'w', 'ς'=>'s',
+		'ϊ'=>'i', 'ΰ'=>'y', 'ϋ'=>'y', 'ΐ'=>'i',
+		// Turkish
+		'Ş'=>'S', 'İ'=>'I', 'Ç'=>'C', 'Ü'=>'U', 'Ö'=>'O', 'Ğ'=>'G',
+		'ş'=>'s', 'ı'=>'i', 'ç'=>'c', 'ü'=>'u', 'ö'=>'o', 'ğ'=>'g',
+		// Russian
+		'А'=>'A', 'Б'=>'B', 'В'=>'V', 'Г'=>'G', 'Д'=>'D', 'Е'=>'E', 'Ё'=>'Yo', 'Ж'=>'Zh',
+		'З'=>'Z', 'И'=>'I', 'Й'=>'J', 'К'=>'K', 'Л'=>'L', 'М'=>'M', 'Н'=>'N', 'О'=>'O',
+		'П'=>'P', 'Р'=>'R', 'С'=>'S', 'Т'=>'T', 'У'=>'U', 'Ф'=>'F', 'Х'=>'H', 'Ц'=>'C',
+		'Ч'=>'Ch', 'Ш'=>'Sh', 'Щ'=>'Sh', 'Ъ'=>'', 'Ы'=>'Y', 'Ь'=>'', 'Э'=>'E', 'Ю'=>'Yu',
+		'Я'=>'Ya',
+		'а'=>'a', 'б'=>'b', 'в'=>'v', 'г'=>'g', 'д'=>'d', 'е'=>'e', 'ё'=>'yo', 'ж'=>'zh',
+		'з'=>'z', 'и'=>'i', 'й'=>'j', 'к'=>'k', 'л'=>'l', 'м'=>'m', 'н'=>'n', 'о'=>'o',
+		'п'=>'p', 'р'=>'r', 'с'=>'s', 'т'=>'t', 'у'=>'u', 'ф'=>'f', 'х'=>'h', 'ц'=>'c',
+		'ч'=>'ch', 'ш'=>'sh', 'щ'=>'sh', 'ъ'=>'', 'ы'=>'y', 'ь'=>'', 'э'=>'e', 'ю'=>'yu',
+		'я'=>'ya',
+		// Ukrainian
+		'Є'=>'Ye', 'І'=>'I', 'Ї'=>'Yi', 'Ґ'=>'G',
+		'є'=>'ye', 'і'=>'i', 'ї'=>'yi', 'ґ'=>'g',
+		// Czech
+		'Č'=>'C', 'Ď'=>'D', 'Ě'=>'E', 'Ň'=>'N', 'Ř'=>'R', 'Š'=>'S', 'Ť'=>'T', 'Ů'=>'U',
+		'Ž'=>'Z',
+		'č'=>'c', 'ď'=>'d', 'ě'=>'e', 'ň'=>'n', 'ř'=>'r', 'š'=>'s', 'ť'=>'t', 'ů'=>'u',
+		'ž'=>'z',
+		// Polish
+		'Ą'=>'A', 'Ć'=>'C', 'Ę'=>'e', 'Ł'=>'L', 'Ń'=>'N', 'Ó'=>'o', 'Ś'=>'S', 'Ź'=>'Z',
+		'Ż'=>'Z',
+		'ą'=>'a', 'ć'=>'c', 'ę'=>'e', 'ł'=>'l', 'ń'=>'n', 'ó'=>'o', 'ś'=>'s', 'ź'=>'z',
+		'ż'=>'z',
+		// Latvian
+		'Ā'=>'A', 'Č'=>'C', 'Ē'=>'E', 'Ģ'=>'G', 'Ī'=>'i', 'Ķ'=>'k', 'Ļ'=>'L', 'Ņ'=>'N',
+		'Š'=>'S', 'Ū'=>'u', 'Ž'=>'Z',
+		'ā'=>'a', 'č'=>'c', 'ē'=>'e', 'ģ'=>'g', 'ī'=>'i', 'ķ'=>'k', 'ļ'=>'l', 'ņ'=>'n',
+		'š'=>'s', 'ū'=>'u', 'ž'=>'z'
+	);
+
 	public static function addSlashes($string, $begin=true, $end=true)
 	{
 		if($begin) {
@@ -54,6 +113,9 @@ public static function randomText($length)
 
 	public static function cleanUrl($string, $separator='-')
 	{
+		// Transliterate characters to ASCII
+		$string = str_replace(array_keys(self::$specialChars), self::$specialChars, $string);
+
 		if(function_exists('iconv')) {
 			$string = iconv('UTF-8', 'ASCII//TRANSLIT', $string);
 		}
@@ -90,7 +152,7 @@ public static function firstCharUp($string, $encoding='UTF-8')
 		{
 		    $strlen 	= mb_strlen($string, $encoding);
 		    $firstChar 	= mb_substr($string, 0, 1, $encoding);
-		    $then 		= mb_substr($string, 1, $strlen - 1, $encoding);
+		    $then 	= mb_substr($string, 1, $strlen - 1, $encoding);
 
 		    return mb_strtoupper($firstChar, $encoding).$then;
 		}