Skip to content

Commit

Permalink
Further improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
g0d committed Feb 24, 2025
1 parent 5de92fa commit 8aa49ec
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 36 deletions.
2 changes: 1 addition & 1 deletion Documentation/Core/classes/MVC.html
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ <h2>Tags</h2>
<article class="method">
<h3 class="public ">Get_Route()</h3>
<a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
<pre class="signature" style="margin-right: 54px;">Get_Route(string <span class="argument">$option</span>, boolean <span class="argument">$lang_relative = true</span>) : string/false</pre>
<pre class="signature" style="margin-right: 54px;">Get_Route(string <span class="argument">$option</span>, boolean <span class="argument">$lang_relative = true</span>) : string</pre>
<p><em>MVC::Get_Route - Get current or all virtual MVC routes</em></p>


Expand Down
6 changes: 2 additions & 4 deletions framework/libs/mvc.php
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,7 @@ public static function Restore_Content($mvc_var)
if (empty($mvc_var))
return false;

$result = self::$__mvc_vars[$mvc_var];

return $result;
}
return self::$__mvc_vars[$mvc_var];
}
}
?>
56 changes: 27 additions & 29 deletions framework/libs/util.php
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ public static function Fetch_Template($template_name, $arguments_array = null)
* @param string $log_data Log data
* @param string $log_type Log type ("info" / "error")
*
* @return bool
* @return bool
*/
public static function Log($log_data, $log_type)
{
Expand Down Expand Up @@ -578,34 +578,32 @@ public static function Delete_Dir($dir)
{
if (is_dir($dir))
{
$files = scandir($dir);

foreach ($files as $this_file)
{
if ($this_file !== '.' && $this_file !== '..')
{
if (filetype($dir . '/' . $this_file) === 'dir')
{
$result = Delete_Dir($dir . '/' . $this_file);

if ($result === false)
return false;
}
else
{
$result = unlink($dir . '/' . $this_file);

if ($result === false)
return false;
}
}
}

reset($files);

$result = rmdir($dir);

return $result;
$files = scandir($dir);

foreach ($files as $this_file)
{
if ($this_file !== '.' && $this_file !== '..')
{
if (filetype($dir . '/' . $this_file) === 'dir')
{
$result = Delete_Dir($dir . '/' . $this_file);

if ($result === false)
return false;
}
else
{
$result = unlink($dir . '/' . $this_file);

if ($result === false)
return false;
}
}
}

reset($files);

return rmdir($dir);
}
else
return false;
Expand Down
2 changes: 1 addition & 1 deletion framework/templates/copyright.phtml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Copyright &copy; 2015 - 2025 <a href="https://twitter.com/gdelaportas" target="_blank">{author}</a> /
Supported by <a href="https://probotek.eu/" target="_blank">PROBOTEK</a>
Supported by <a href="https://probotek.eu/" target="_blank">PROBOTEK</a>
2 changes: 1 addition & 1 deletion framework/templates/info.phtml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<div class="info">{message}</div>
<div class="info">{message}</div>

0 comments on commit 8aa49ec

Please sign in to comment.